From 09a00acc0c307da9a5d48c7389220db648e8580d Mon Sep 17 00:00:00 2001 From: z0rglub Date: Thu, 7 Oct 2004 21:42:22 +0000 Subject: - bug 55 : Cannot redeclare scandir(), this function is new in PHP 5.x git-svn-id: http://piwigo.org/svn/branches/release-1_3@557 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/thumbnail.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/thumbnail.php b/admin/thumbnail.php index d2269762f..cdd864af2 100644 --- a/admin/thumbnail.php +++ b/admin/thumbnail.php @@ -68,12 +68,12 @@ function get_images_without_thumbnail( $dir ) return $images; } -// scandir scans a dir to find pictures without thumbnails. Once found, +// pwg_scandir scans a dir to find pictures without thumbnails. Once found, // creation of the thumbnails (RatioResizeImg). Only the first $_POST['n'] // pictures without thumbnails are treated. -// scandir returns an array with the generation time of each thumbnail (for +// pwg_scandir returns an array with the generation time of each thumbnail (for // statistics purpose) -function scandir( $dir, $width, $height ) +function pwg_scandir( $dir, $width, $height ) { global $conf; $stats = array(); @@ -297,7 +297,7 @@ if ( isset( $_GET['dir'] ) ) if ( count( $errors ) == 0 ) { $vtp->addSession( $sub, 'results' ); - $stats = scandir( $_GET['dir'], $_POST['width'], $_POST['height'] ); + $stats = pwg_scandir( $_GET['dir'], $_POST['width'], $_POST['height'] ); $times = array(); foreach ( $stats as $stat ) { array_push( $times, $stat['time'] ); -- cgit v1.2.3