diff options
| author | rvelices <rv-github@modusoptimus.com> | 2008-02-13 01:25:07 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2008-02-13 01:25:07 +0000 |
| commit | e31b4e49d61a23cee65d40240a249c062f37c596 (patch) | |
| tree | 99c66f2a285b3278d81a89e3b1070b6292a30c41 /include | |
| parent | e3a7b726d2fda5a8b32eeb0c9b24cfd908d0dee7 (diff) | |
merge revisions 2205 and 2206 from trunk to branch-1_7
feature 803: Implement keyboard navigation (left/right arrows) on the picture page
fix: non-image elements without representative and without mime type icon default to thumbnail if possible
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2207 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions_picture.inc.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/functions_picture.inc.php b/include/functions_picture.inc.php index 09b7c90ce..1a479881c 100644 --- a/include/functions_picture.inc.php +++ b/include/functions_picture.inc.php @@ -149,6 +149,11 @@ function get_image_location($element_info) $ext = get_extension($element_info['path']); $path = get_themeconf('mime_icon_dir'); $path.= strtolower($ext).'.png'; + if ( !file_exists(PHPWG_ROOT_PATH.$path) + and !empty($element_info['tn_ext']) ) + { + $path = get_thumbnail_location($element_info); + } } // plugins want another location ? |