From a538706de569510e93ba699d160d90df4daf3d66 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 24 Nov 2014 16:25:05 +0000
Subject: [PATCH] - Fix missing new directory icon in context menu - Fix
 drop/paste into empty directory

---
 filemanager/inc/class.filemanager_ui.inc.php |  1 +
 filemanager/js/app.js                        | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index 320c3ad201..91fc8c488e 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -146,6 +146,7 @@ class filemanager_ui
 			),
 			'mkdir' => array(
 				'caption' => lang('Create directory'),
+				'icon' => 'filemanager/button_createdir',
 				'group' => $group,
 				'allowOnMultiple' => false,
 				'onExecute' => 'javaScript:app.filemanager.createdir'
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index e9c505f447..23e08539a0 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -621,15 +621,20 @@ app.classes.filemanager = AppJS.extend(
 		var dst = this.get_path();
 
 		// File(s) were dropped on a row, they want them inside
-		if(_target && _target.id)
+		if(_target)
 		{
-			dst = this.id2path(_target.id);
+			var dst = ''
+			var paths = this._elems2paths([_target]);
+			if(paths[0]) dst = paths[0];
 
 			// check if target is a file --> use it's directory instead
-			var data = egw.dataGetUIDdata(_target.id);
-			if (!data || data.data.mime != 'httpd/unix-directory')
+			if(_target.id)
 			{
-				dst = this.dirname(dst);
+				var data = egw.dataGetUIDdata(_target.id);
+				if (!data || data.data.mime != 'httpd/unix-directory')
+				{
+					dst = this.dirname(dst);
+				}
 			}
 		}