aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/common.inc.php2
-rw-r--r--include/functions.inc.php11
2 files changed, 0 insertions, 13 deletions
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