Beta5
This commit is contained in:
@ -1,6 +1,6 @@
|
|||||||
# $Id$
|
# $Id$
|
||||||
|
|
||||||
Version 1.1-beta5 ()
|
Version 1.1-beta5 (October 18th, 2006)
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
* Added new plugin hooks:
|
* Added new plugin hooks:
|
||||||
|
@ -305,7 +305,7 @@ switch ($serendipity['GET']['adminAction']) {
|
|||||||
|
|
||||||
// Insert into database
|
// Insert into database
|
||||||
$image_id = serendipity_insertImageInDatabase($tfile, $serendipity['POST']['target_directory'][$idx], $authorid, null, $realname);
|
$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(
|
$new_media[] = array(
|
||||||
'image_id' => $image_id,
|
'image_id' => $image_id,
|
||||||
'target' => $target,
|
'target' => $target,
|
||||||
|
@ -164,10 +164,9 @@ class Serendipity_Import {
|
|||||||
function &nativeQuery($query, $db = false) {
|
function &nativeQuery($query, $db = false) {
|
||||||
global $serendipity;
|
global $serendipity;
|
||||||
|
|
||||||
mysql_select_db($this->data['name']);
|
mysql_select_db($this->data['name'], $db);
|
||||||
$return = &mysql_query($query, $db);
|
$return = &mysql_query($query, $db);
|
||||||
// print_r($return);
|
mysql_select_db($serendipity['dbName'], $serendipity['dbConn']); $return = &mysql_query($query, $db);
|
||||||
mysql_select_db($serendipity['dbName']);
|
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -620,6 +620,7 @@ function serendipity_makeThumbnail($file, $directory = '', $size = false, $thumb
|
|||||||
} else {
|
} else {
|
||||||
$outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf;
|
$outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $directory . $f . '.' . $thumbname . '.' . $suf;
|
||||||
}
|
}
|
||||||
|
$serendipity['last_outfile'] = $outfile;
|
||||||
# echo 'To: ' . $outfile . '<br />';
|
# echo 'To: ' . $outfile . '<br />';
|
||||||
|
|
||||||
$fdim = @serendipity_getimagesize($infile, '', $suf);
|
$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>";
|
if ($debug) echo "<p>File name is $sFileName,<br />thumbnail is $sThumbNailFile</p>";
|
||||||
unset($aResultSet[$sKey]);
|
unset($aResultSet[$sKey]);
|
||||||
|
|
||||||
if (isset($aFilesOnDisk[$sFileName])){
|
if (isset($aFilesOnDisk[$sFileName])) {
|
||||||
unset($aFilesOnDisk[$sFileName]);
|
unset($aFilesOnDisk[$sFileName]);
|
||||||
} else {
|
} else {
|
||||||
if ($debug) "Deleting Image {$sFile['id']}<br />\n";
|
if ($debug) "Deleting Image {$sFile['id']}<br />\n";
|
||||||
|
Reference in New Issue
Block a user