aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/template.class.php26
-rw-r--r--picture.php6
2 files changed, 8 insertions, 24 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 63133384f..5a99cab6f 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -46,7 +46,7 @@ class Template {
const COMBINED_CSS_TAG = '<!-- COMBINED_CSS -->';
var $css_by_priority = array();
-
+
var $picture_buttons = array();
var $index_buttons = array();
@@ -602,13 +602,6 @@ class Template {
}
}
- // TEMP in 2.5 for backward compatibility
- if(!empty($params['require']))
- {
- $params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
- $params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
- }
-
$this->scriptLoader->add( $params['id'], $load,
empty($params['require']) ? array() : explode( ',', $params['require'] ),
@$params['path'],
@@ -692,13 +685,6 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
if ( !empty($content) )
{ // second call
- // TEMP in 2.5 for backward compatibility
- if(!empty($params['require']))
- {
- $params['require'] = str_replace('jquery.effects.', 'jquery.ui.effect-', $params['require'] );
- $params['require'] = str_replace('jquery.effects', 'jquery.ui.effect', $params['require'] );
- }
-
$this->scriptLoader->add_inline(
$content,
empty($params['require']) ? array() : explode(',', $params['require'])
@@ -874,17 +860,17 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
}
return $themeconfs[$dir];
}
-
+
function add_picture_button($content, $rank)
{
$this->picture_buttons[$rank][] = $content;
}
-
+
function add_index_button($content, $rank)
{
$this->index_buttons[$rank][] = $content;
}
-
+
function parse_picture_buttons()
{
if (!empty($this->picture_buttons))
@@ -895,7 +881,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$this->concat('PLUGIN_PICTURE_ACTIONS', $content);
}
}
-
+
function parse_index_buttons()
{
if (!empty($this->index_buttons))
@@ -906,7 +892,7 @@ var s,after = document.getElementsByTagName(\'script\')[document.getElementsByTa
$this->concat('PLUGIN_INDEX_ACTIONS', $content);
}
}
-
+
}
diff --git a/picture.php b/picture.php
index 092b2aed2..ea22c8751 100644
--- a/picture.php
+++ b/picture.php
@@ -150,7 +150,7 @@ trigger_action('loc_begin_picture');
function default_picture_content($content, $element_info)
{
global $conf;
-
+
if ( !empty($content) )
{// someone hooked us - so we skip;
return $content;
@@ -377,7 +377,7 @@ UPDATE '.USER_CACHE_CATEGORIES_TABLE.'
}
unset($_POST['content']);
}
-
+
$edit_comment = $_GET['comment_to_edit'];
}
break;
@@ -773,7 +773,6 @@ if (is_admin())
array('action'=>'add_to_caddie')
),
'U_PHOTO_ADMIN' => $url_admin,
- 'U_ADMIN' => $url_admin, // TEMP 2.5 for backward compatibility
)
);
@@ -986,7 +985,6 @@ if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('
{
if (!isset($page['start'])) $page['start'] = 0;
include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
- if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu TEMP 2.5 for backward compatibility
}
include(PHPWG_ROOT_PATH.'include/page_header.php');