bug fixed: popuhelp (slash)

svn merge -r1248:1249 from branch-1_6 into trunk


git-svn-id: http://piwigo.org/svn/trunk@1250 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 8 insertions, 8 deletions

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 9bfa257dd..3d7ed8cb7 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -249,7 +249,7 @@ $template->assign_vars(
       ),
 
     'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_modify',
 
     'F_ACTION' => $form_action,
     )
diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 671194eb4..7fa279c49 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -212,7 +212,7 @@ $template->assign_vars(
         $page['cat'],
         'admin.php?page=cat_modify&cat_id='
         ),
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_perm',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm',
     'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
     )
   );
diff --git a/admin/configuration.php b/admin/configuration.php
index 86a027dc5..9f01849f6 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -160,7 +160,7 @@ $template->assign_vars(
     'L_SUBMIT'=>$lang['submit'],
     'L_RESET'=>$lang['reset'],
 
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=configuration',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=configuration',
 
     'F_ACTION'=>$action
     ));
diff --git a/admin/maintenance.php b/admin/maintenance.php
index 2fa60696c..8bfef45a8 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -110,7 +110,7 @@ $template->assign_vars(
     'U_MAINT_SESSIONS' => $start_url.'sessions',
     'U_MAINT_FEEDS' => $start_url.'feeds',
     'U_MAINT_DATABASE' => $start_url.'database',
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=maintenance',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=maintenance',
     )
   );
 
diff --git a/admin/site_manager.php b/admin/site_manager.php
index 6060b603f..6e53bb55b 100644
--- a/admin/site_manager.php
+++ b/admin/site_manager.php
@@ -204,7 +204,7 @@ SELECT galleries_url
 }
 
 $template->assign_vars( array(
-  'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=remote_site',
+  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=remote_site',
   'F_ACTION' => PHPWG_ROOT_PATH.'admin.php'
                 .get_query_string_diff( array('action','site') )
   ) );
diff --git a/admin/site_update.php b/admin/site_update.php
index 40615f073..547e72c36 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -874,7 +874,7 @@ $template->assign_vars(
 
 $template->assign_vars(
   array(
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=synchronize'
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=synchronize'
     )
   );
 // +-----------------------------------------------------------------------+
diff --git a/admin/user_list.php b/admin/user_list.php
index 2fffbcd34..9df0f3f0e 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -479,7 +479,7 @@ $template->assign_vars(
     'L_DELETE' => $lang['user_delete'],
     'L_DELETE_HINT' => $lang['user_delete_hint'],
 
-    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=user_list',
+    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=user_list',
     
     'F_ADD_ACTION' => $base_url,
     'F_USERNAME' => @$_GET['username'],
diff --git a/search.php b/search.php
index cc461f6df..0701eafa1 100644
--- a/search.php
+++ b/search.php
@@ -189,7 +189,7 @@ $template->assign_vars(array(
   'TODAY_MONTH' => date('m', time()),
   'TODAY_YEAR' => date('Y', time()),
   'S_SEARCH_ACTION' => 'search.php',
-  'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=search',
+  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=search',
   'U_HOME' => make_index_url(),
 
   'TAG_SELECTION' => get_html_tag_selection(