Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

1 files changed, 1 insertions, 21 deletions

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 2cbcece5e..a200a3ded 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -254,7 +254,7 @@ function ajax_mediadiff(){
 
     $image = '';
     if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
-    $NS = $INPUT->post->str('ns');
+    $NS = getNS($image);
     $auth = auth_quickaclcheck("$NS:*");
     media_diff($image, $NS, $auth, true);
 }
@@ -306,26 +306,6 @@ function ajax_mediaupload(){
     echo htmlspecialchars($json->encode($result), ENT_NOQUOTES);
 }
 
-function dir_delete($path) {
-    if (!is_string($path) || $path == "") return false;
-
-    if (is_dir($path) && !is_link($path)) {
-        if (!$dh = @opendir($path)) return false;
-
-        while ($f = readdir($dh)) {
-            if ($f == '..' || $f == '.') continue;
-            dir_delete("$path/$f");
-        }
-
-        closedir($dh);
-        return @rmdir($path);
-    } else {
-        return @unlink($path);
-    }
-
-    return false;
-}
-
 /**
  * Return sub index for index view
  *