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
This commit is contained in:
rvelices
2012-01-17 21:58:18 +00:00
parent e1bd64fdfc
commit cc01941ed9
14 changed files with 150 additions and 169 deletions
+2 -21
View File
@@ -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;
}
?>
?>