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

Patched serendipity_displayImageList() to only sync images when $limit_path is NULL and $manage is false.

Browse Source 
Bumped version to beta3 for better version management on plugins.
This commit is contained in:
Matthew Groening
2006-08-21 18:09:20 +00:00
parent 89f459855c
commit 72388a349b
2 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions_images.inc.php
View File

@ -1356,6 +1356,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
} }
$start = ($page-1) * $perPage; $start = ($page-1) * $perPage;
if ($manage && $limit_path == NULL) {
## SYNCH START ## ## SYNCH START ##
$aExclude = array("CVS" => true, ".svn" => true); $aExclude = array("CVS" => true, ".svn" => true);
serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude); serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude);
@ -1372,7 +1373,6 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
FALSE, FALSE,
$aExclude $aExclude
); );
foreach ($aResultSet AS $sKey => $sFile) { foreach ($aResultSet AS $sKey => $sFile) {
if ($sFile['directory']) { if ($sFile['directory']) {
if ($debug) echo "{$sFile['relpath']} is a directory.<br />"; if ($debug) echo "{$sFile['relpath']} is a directory.<br />";
@ -1421,7 +1421,6 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
serendipity_deleteImage($sFile['id']); serendipity_deleteImage($sFile['id']);
++$nCount; ++$nCount;
} }
unset($aFilesOnDisk[$sThumbNailFile]); unset($aFilesOnDisk[$sThumbNailFile]);
} }
} }
@ -1475,6 +1474,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
echo "<p> total time taken was " . $nDifference . "</p>"; echo "<p> total time taken was " . $nDifference . "</p>";
*/ */
## SYNCH FINISHED ## ## SYNCH FINISHED ##
}
## Aply ACL afterwards: ## Aply ACL afterwards:
serendipity_directoryACL($paths, 'read'); serendipity_directoryACL($paths, 'read');

2
serendipity_config.inc.php
View File

@ -27,7 +27,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
include(S9Y_INCLUDE_PATH . 'include/compat.inc.php'); include(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
// The version string // The version string
$serendipity['version'] = '1.1-beta2'; $serendipity['version'] = '1.1-beta3';
// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'. // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true); $serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);