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
This commit is contained in:
parent
9b7af68895
commit
a89ecb6e41
8 changed files with 8 additions and 8 deletions
|
@ -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,
|
||||
)
|
||||
|
|
|
@ -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']
|
||||
)
|
||||
);
|
||||
|
|
|
@ -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
|
||||
));
|
||||
|
|
|
@ -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',
|
||||
)
|
||||
);
|
||||
|
||||
|
|
|
@ -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') )
|
||||
) );
|
||||
|
|
|
@ -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'
|
||||
)
|
||||
);
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue