adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- faster trigger_event/trigger_action (it was overly complicated)

Browse Source 
- added a new param to get_thumbnail_url event
- get_thumbnail_location is called only if the thumbnail does not exist

git-svn-id: http://piwigo.org/svn/trunk@8263 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-12-23 20:46:16 +00:00
parent 70b02e28f1
commit 7d75444761
2 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+7 -9
View File
@@ -735,15 +735,14 @@ function get_thumbnail_path($element_info)
*/
function get_thumbnail_url($element_info)
{
$path = get_thumbnail_location($element_info);
if ( !url_is_remote($path) )
$loc = $url = get_thumbnail_location($element_info);
if ( !url_is_remote($loc) )
{
$path = embellish_url(get_root_url().$path);
$url = (get_root_url().$loc);
}
// plugins want another url ?
$path = trigger_event('get_thumbnail_url', $path, $element_info);
return $path;
$url = trigger_event('get_thumbnail_url', $url, $element_info, $loc);
return embellish_url($url);
}
/* returns the relative path of the thumnail with regards to to the root
@@ -766,10 +765,9 @@ function get_thumbnail_location($element_info)
{
$path = get_themeconf('mime_icon_dir')
.strtolower(get_extension($element_info['path'])).'.png';
// plugins want another location ?
$path = trigger_event( 'get_thumbnail_location', $path, $element_info);
}
// plugins want another location ?
$path = trigger_event( 'get_thumbnail_location', $path, $element_info);
return $path;
}