From cc01941ed97f6c8f6790931bfc167ba45c5a8f91 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 17 Jan 2012 21:58:18 +0000 Subject: feature 2548 multisize - code cleanup + better usage in category_cats + i.php logs memory usage peak git-svn-id: http://piwigo.org/svn/trunk@12920 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_picture.inc.php | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'include/functions_picture.inc.php') diff --git a/include/functions_picture.inc.php b/include/functions_picture.inc.php index 85de60b14..aac3e45b1 100644 --- a/include/functions_picture.inc.php +++ b/include/functions_picture.inc.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | Piwigo - a PHP based photo gallery | // +-----------------------------------------------------------------------+ -// | Copyright(C) 2008-2011 Piwigo Team http://piwigo.org | +// | Copyright(C) 2008-2012 Piwigo Team http://piwigo.org | // | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net | // | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick | // +-----------------------------------------------------------------------+ @@ -22,25 +22,6 @@ // +-----------------------------------------------------------------------+ - -/* - * Returns the name of a photo according to its name and its filename. - * @param name string - * @param filename string - * @return string - */ -function get_image_name($name, $filename) -{ - if (!empty($name)) - { - return $name; - } - else - { - return get_name_from_file($filename); - } -} - /* * @param element_info array containing element information from db; * at least 'id', 'path', 'has_high' should be present @@ -249,4 +230,4 @@ function get_picture_size( $original_width, $original_height, return $picture_size; } -?> +?> \ No newline at end of file -- cgit v1.2.3