From a6c33e933252b3b9f0b3efc86b73782d15d0ad4a Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 27 Aug 2012 18:32:10 +0000 Subject: remove deprecated function get_thumbnail_url + $conf['local_data_dir'] git-svn-id: http://piwigo.org/svn/trunk@17649 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/album_notification.php | 4 ++-- include/common.inc.php | 2 -- include/functions.inc.php | 11 ----------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/admin/album_notification.php b/admin/album_notification.php index c456f056f..c48ff8350 100644 --- a/admin/album_notification.php +++ b/admin/album_notification.php @@ -55,7 +55,7 @@ if (isset($_POST['submitEmail']) and !empty($_POST['group'])) if (!empty($category['representative_picture_id'])) { $query = ' -SELECT id, file, path +SELECT id, file, path, representative_ext FROM '.IMAGES_TABLE.' WHERE id = '.$category['representative_picture_id'].' ;'; @@ -71,7 +71,7 @@ SELECT id, file, path 'image_file' => $element['file'], 'category' => $category )) - .'" class="thumblnk">'; + .'" class="thumblnk">'; } } diff --git a/include/common.inc.php b/include/common.inc.php index 49a46028c..7c645a236 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -86,11 +86,9 @@ foreach( array( include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); -if (!isset($conf['local_data_dir'])) $conf['local_data_dir'] = realpath(PHPWG_ROOT_PATH.$conf['data_location']); // temp 2.4 for backward compatibility defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); - @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'); if (!defined('PHPWG_INSTALLED')) { diff --git a/include/functions.inc.php b/include/functions.inc.php index 14ee6b42c..94b962db6 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -808,17 +808,6 @@ function get_element_path($element_info) } -/* Returns the URL of the thumbnail to be displayed. If the element does not - * have a thumbnail, the default mime image url is returned. The URL can be - * sent to the browser, but not used in the php script. - * @param array element_info assoc array containing element info from db - * at least 'path' and 'id' should be present - */ -function get_thumbnail_url($element_info) -{ - return DerivativeImage::thumb_url($element_info); -} - /** * fill the current user caddie with given elements, if not already in * caddie -- cgit v1.2.3