From bf4d7dca1411d0127f6b47dbc18cc2b1cb007f88 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 24 Feb 2011 13:48:31 +0000 Subject: new function to get image name depending on name and filename git-svn-id: http://piwigo.org/svn/trunk@9366 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_picture.inc.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/functions_picture.inc.php b/include/functions_picture.inc.php index 8c9f4bafd..3eb90af0b 100644 --- a/include/functions_picture.inc.php +++ b/include/functions_picture.inc.php @@ -65,6 +65,25 @@ function get_element_location($element_info) } +/* + * 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); + } +} + + /** * Returns the PATH to the image to be displayed in the picture page. If the * element is not a picture, then the representative image or the default -- cgit v1.2.3