diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-14 12:17:41 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-14 12:17:41 -0700 |
| commit | 939174eac8c93f53193b5fb7101c5c4228e39825 (patch) | |
| tree | 4a8c601332c180168956bcd755f17819cfb7e476 /phpBB/includes | |
| parent | 235e3f55956001ad98c6c584913b4e9723112607 (diff) | |
| parent | d27bc857f3b8c434696f3324574a9cc10ca9159a (diff) | |
| download | forums-939174eac8c93f53193b5fb7101c5c4228e39825.tar forums-939174eac8c93f53193b5fb7101c5c4228e39825.tar.gz forums-939174eac8c93f53193b5fb7101c5c4228e39825.tar.bz2 forums-939174eac8c93f53193b5fb7101c5c4228e39825.tar.xz forums-939174eac8c93f53193b5fb7101c5c4228e39825.zip | |
Merge pull request #1666 from cyberalien/ticket/11795
Move JS from html files to forum_fn.js
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bf973fe141..888ef59222 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2343,7 +2343,6 @@ function phpbb_generate_template_pagination($template, $base_url, $block_var_nam $template_array = array( $tpl_prefix . 'BASE_URL' => $base_url, - 'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url), $tpl_prefix . 'PER_PAGE' => $per_page, 'U_' . $tpl_prefix . 'PREVIOUS_PAGE' => $previous_page, 'U_' . $tpl_prefix . 'NEXT_PAGE' => ($on_page != $total_pages) ? $base_url . $url_delim . $start_name . '=' . ($on_page * $per_page) : '', @@ -2383,7 +2382,7 @@ function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $star $template->assign_vars(array( 'PER_PAGE' => $per_page, 'ON_PAGE' => $on_page, - 'A_BASE_URL' => addslashes($base_url), + 'BASE_URL' => $base_url, )); return sprintf($user->lang['PAGE_OF'], $on_page, max(ceil($num_items / $per_page), 1)); @@ -5334,7 +5333,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'U_PRIVATEMSGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'U_RETURN_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'U_POPUP_PM' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup'), - 'UA_POPUP_PM' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup')), 'U_MEMBERLIST' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), 'U_VIEWONLINE' => ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '', 'U_LOGIN_LOGOUT' => $u_login_logout, |