diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-31 00:44:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-31 00:44:58 +0100 |
| commit | d499db36a03e85e808e180b19ed3480cd08a2d84 (patch) | |
| tree | a9a5e832a7bb5c47082f772c1aa0fdcbf1a1ce3b /phpBB/includes | |
| parent | f11b7a7828bb703b44f819ae7b2412f0591c2ef1 (diff) | |
| parent | 831075e5fe48849e226009ce3d53c396d75675f0 (diff) | |
| download | forums-d499db36a03e85e808e180b19ed3480cd08a2d84.tar forums-d499db36a03e85e808e180b19ed3480cd08a2d84.tar.gz forums-d499db36a03e85e808e180b19ed3480cd08a2d84.tar.bz2 forums-d499db36a03e85e808e180b19ed3480cd08a2d84.tar.xz forums-d499db36a03e85e808e180b19ed3480cd08a2d84.zip | |
Merge remote-tracking branch 'prototech/ticket/11987' into develop
* prototech/ticket/11987:
[ticket/11987] Add {ADMIN_ROOT_PATH}.
[ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}.
[ticket/11987] Change {ROOT_PATH} to point to board root.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 55459739ca..2282863746 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -748,7 +748,6 @@ class acp_attachments } $template->assign_vars(array( - 'PHPBB_ROOT_PATH' => $phpbb_root_path, 'IMG_PATH' => $img_path, 'ACTION' => $action, 'GROUP_ID' => $group_id, diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 5b23f9c3a0..368651a79e 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -307,7 +307,6 @@ class acp_icons 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'], 'IMG_PATH' => $img_path, - 'PHPBB_ROOT_PATH' => $phpbb_root_path, 'CODE' => $default_row['code'], 'EMOTION' => $default_row['emotion'], diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index c83bc1f7a6..b9210114ef 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -67,7 +67,8 @@ function adm_page_header($page_title) 'SID' => $SID, '_SID' => $_SID, 'SESSION_ID' => $user->session_id, - 'ROOT_PATH' => $phpbb_admin_path, + 'ROOT_PATH' => $phpbb_root_path, + 'ADMIN_ROOT_PATH' => $phpbb_admin_path, 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), 'U_ADM_LOGOUT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'), |