aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/cat_perm.php6
-rw-r--r--admin/configuration.php6
-rw-r--r--admin/help.php7
-rw-r--r--admin/ws_checker.php4
4 files changed, 10 insertions, 13 deletions
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index bca45faa0..13da8e727 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -198,15 +198,15 @@ SELECT user_id, cat_id
$template->set_filename('cat_perm', 'admin/cat_perm.tpl');
-$template->assign_vars(
+$template->assign(
array(
'CATEGORIES_NAV' =>
get_cat_display_name_from_id(
$page['cat'],
'admin.php?page=cat_modify&cat_id='
),
- 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm',
- 'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
+ 'U_HELP' => get_root_url().'popuphelp.php?page=cat_perm',
+ 'F_ACTION' => get_root_url().'admin.php?page=cat_perm&cat='.$page['cat']
)
);
diff --git a/admin/configuration.php b/admin/configuration.php
index 9f741ad89..772e2965b 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -4,8 +4,7 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
+// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
@@ -173,10 +172,9 @@ $tabsheet->assign();
$action = get_root_url().'admin.php?page=configuration';
$action.= '&section='.$page['section'];
-$template->assign_vars(
+$template->assign(
array(
'U_HELP' => get_root_url().'popuphelp.php?page=configuration',
-
'F_ACTION'=>$action
));
diff --git a/admin/help.php b/admin/help.php
index bc588ee22..4634a4d41 100644
--- a/admin/help.php
+++ b/admin/help.php
@@ -2,10 +2,9 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
+// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
@@ -32,5 +31,5 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
// +-----------------------------------------------------------------------+
check_status(ACCESS_ADMINISTRATOR);
-$template->assign_var('ADMIN_CONTENT', load_language('help.html','','',true) );
+$template->assign('ADMIN_CONTENT', load_language('help.html','','',true) );
?>
diff --git a/admin/ws_checker.php b/admin/ws_checker.php
index e50f17fdf..d820c5340 100644
--- a/admin/ws_checker.php
+++ b/admin/ws_checker.php
@@ -209,9 +209,9 @@ if (isset($_POST['wsX_submit']))
-$template->assign_vars(
+$template->assign(
array(
- 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=web_service',
+ 'U_HELP' => get_root_url().'popuphelp.php?page=web_service',
)
);