Beta5

diff --git a/docs/NEWS b/docs/NEWS
index 75651f5cac4051932dc553c4aea6bfc9f8f04ad0..e6c5d3674e9178ac64bc5e5ade75e5fee8cbf4d5 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,6 +1,6 @@
 # $Id$
 
-Version 1.1-beta5 ()
+Version 1.1-beta5 (October 18th, 2006)
 ------------------------------------------------------------------------
 
     * Added new plugin hooks:

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index d88207e8e494a4e221ac6ecb9070e22c1f9298dd..87f53d8207dc691bed388eaa43966eb36e69fdf3 100644 (file)
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -305,7 +305,7 @@ switch ($serendipity['GET']['adminAction']) {
 
                 // Insert into database
                 $image_id = serendipity_insertImageInDatabase($tfile, $serendipity['POST']['target_directory'][$idx], $authorid, null, $realname);
-                serendipity_plugin_api::hook_event('backend_image_add', $target);
+                serendipity_plugin_api::hook_event('backend_image_add', $target, $created_thumbnail);
                 $new_media[] = array(
                     'image_id'          => $image_id,
                     'target'            => $target,

diff --git a/include/admin/import.inc.php b/include/admin/import.inc.php
index f03915d77e2eabf0a5b25b444e6ec52bd4d72cdb..1c6976868bdc75ffb8d72bac3b913098ddc49748 100644 (file)
--- a/include/admin/import.inc.php
+++ b/include/admin/import.inc.php
@@ -11,7 +11,9 @@ if (!serendipity_checkPermission('adminImport')) {
 }
 
 /* This won't do anything if safe-mode is ON, but let's try anyway since importing could take a while */
-@set_time_limit(0);
+if (function_exists('set_time_limit')) {
+    @set_time_limit(0);
+}
 
 /* Class construct. Each importer plugin must extend this class. */
 class Serendipity_Import {
@@ -162,10 +164,9 @@ class Serendipity_Import {
     function &nativeQuery($query, $db = false) {
         global $serendipity;
 
-        mysql_select_db($this->data['name']);
+        mysql_select_db($this->data['name'], $db);
         $return = &mysql_query($query, $db);
-        // print_r($return);
-        mysql_select_db($serendipity['dbName']);
+        mysql_select_db($serendipity['dbName'], $serendipity['dbConn']);        $return = &mysql_query($query, $db);
         return $return;
     }
 }

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index dd2af52aa476d946409b3e48d4f9616455c8dd7e..62ed79ce97152fec8f4a6fddbc4709696a03ead0 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -620,6 +620,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
     } else {
         $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf;
     }
+    $serendipity['last_outfile'] = $outfile;
 #    echo 'To: ' . $outfile . '<br />';
 
     $fdim    = @serendipity_getimagesize($infile, '', $suf);
@@ -1417,7 +1418,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
                     if ($debug) echo "<p>File name is $sFileName,<br />thumbnail is $sThumbNailFile</p>";
                     unset($aResultSet[$sKey]);
 
-                    if (isset($aFilesOnDisk[$sFileName])){
+                    if (isset($aFilesOnDisk[$sFileName])) {
                         unset($aFilesOnDisk[$sFileName]);
                     } else {
                         if ($debug) "Deleting Image {$sFile['id']}<br />\n";