mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Beta5

Browse Source
This commit is contained in:
Garvin Hicking 2006-10-18 12:40:25 +00:00
parent e5f078a540
commit a1502914bc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/NEWS
View File

@ -1,6 +1,6 @@
# $Id$
Version 1.1-beta5 ()
Version 1.1-beta5 (October 18th, 2006)
------------------------------------------------------------------------
* Added new plugin hooks:

2
include/admin/images.inc.php
View File

@ -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,

5
include/admin/import.inc.php
View File

@ -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;
}
}

3
include/functions_images.inc.php
View File

@ -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";