From 88919c3433c7c976b460a3e371b6f002afa55800 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Wed, 18 Oct 2006 12:40:25 +0000
Subject: [PATCH] Beta5
---
docs/NEWS | 2 +-
include/admin/images.inc.php | 2 +-
include/admin/import.inc.php | 5 ++---
include/functions_images.inc.php | 3 ++-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/NEWS b/docs/NEWS
index 75651f5c..e6c5d367 100644
--- 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 d88207e8..87f53d82 100644
--- 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 3ed958ea..1c697686 100644
--- a/include/admin/import.inc.php
+++ b/include/admin/import.inc.php
@@ -164,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 dd2af52a..62ed79ce 100644
--- 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";