fix a few bugs

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 83b42e2bfc2c3f6f68b20d1b73a9544ec6624b5d..557b536dc7fc80da1c624457e006b338693631a3 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -64,7 +64,7 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
 
     $where_sql = "WHERE 1 \n";
     if (!empty($directory)) {
-        $where_sql .= " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "'%'\n";
+        $where_sql .= " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "%'\n";
     }
 
     if (!empty($filename)) {
@@ -197,9 +197,11 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
 
     $rs = serendipity_db_query($query, false, 'assoc');
 
-    if (!is_array($rs)) {
+    if (!is_array($rs) && $rs !== true && $rs !== 1) {
         echo '<div>' . $rs . '</div>';
         return array();
+    } elseif (!is_array($rs)) {
+        return array();
     }
 
     $total_query = "SELECT count(DISTINCT i.id)

diff --git a/serendipity_admin_image_selector.php b/serendipity_admin_image_selector.php
index 48fbefb7c70d2d6dcd4fc86b1bd4e06c2c530d70..5dc595664c36e2e389235e1fad9d9c823faf8312 100644 (file)
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@@ -37,6 +37,10 @@ if (empty($serendipity['GET']['step']) && $serendipity['GET']['page'] < 1) {
     return;
 }
 
+$import_vars = $serendipity['GET'];
+unset($import_vars['step']);
+unset($import_vars['only_path']);
+
 $showFile = 'admin/media_choose.tpl';
 $body_id = 'serendipityAdminBodyImageSelector';
 if ($serendipity['GET']['step'] === 'tree') {
@@ -44,14 +48,15 @@ if ($serendipity['GET']['step'] === 'tree') {
 }
 
 $media = array(
-    'body_id'   => $body_id,
-    'only_path' => $serendipity['GET']['only_path'],
-    'css'       => serendipity_rewriteURL('serendipity_admin.css'),
-    'css_tree'  => serendipity_getTemplateFile('treeview/tree.css'),
-    'css_front' => serendipity_rewriteURL('serendipity.css'),
-    'token_url' => serendipity_setFormToken('url'),
-    'imgID'     => (int)$serendipity['GET']['image'],
-    'from'      => $serendipity['GET']['from']
+    'body_id'    => $body_id,
+    'only_path'  => $serendipity['GET']['only_path'],
+    'css'        => serendipity_rewriteURL('serendipity_admin.css'),
+    'css_tree'   => serendipity_getTemplateFile('treeview/tree.css'),
+    'css_front'  => serendipity_rewriteURL('serendipity.css'),
+    'token_url'  => serendipity_setFormToken('url'),
+    'imgID'      => (int)$serendipity['GET']['image'],
+    'from'       => $serendipity['GET']['from'],
+    'GET_STRING' => serendipity_build_query($import_vars, 'serendipity', '&')
 );
 
 switch ($serendipity['GET']['step']) {
@@ -195,7 +200,7 @@ switch ($serendipity['GET']['step']) {
 
             $showfile = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/mediacache/cache_img' . (int)$serendipity['GET']['image'] . '_' . $width . '_' . $height;
 
-            if (!file_exists($cachefile)) {
+            if (!file_exists($showfile)) {
                 serendipity_makeThumbnail(
                     $media['file']['realname'],
                     $media['file']['path'],