makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prototech/ticket/11987' into develop

Browse source 
* 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.
This commit is contained in:
Andreas Fischer 2013-10-31 00:44:58 +01:00
commit d499db36a0
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_attachments.html
View file

@ -122,11 +122,11 @@
{ {
if (newimage == 'no_image') if (newimage == 'no_image')
{ {
document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}images/spacer.gif"; document.getElementById('image_upload_icon').src = "{ROOT_PATH}images/spacer.gif";
} }
else else
{ {
document.getElementById('image_upload_icon').src = "{PHPBB_ROOT_PATH}{IMG_PATH}/" + newimage; document.getElementById('image_upload_icon').src = "{ROOT_PATH}{IMG_PATH}/" + newimage;
} }
} }
@ -192,7 +192,7 @@
<dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);"> <dd><select name="upload_icon" id="upload_icon" onchange="update_image(this.options[selectedIndex].value);">
<option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST} <option value="no_image"<!-- IF S_NO_IMAGE --> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option>{S_FILENAME_LIST}
</select></dd> </select></dd>
<dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{PHPBB_ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd> <dd>&nbsp;<img <!-- IF S_NO_IMAGE -->src="{ROOT_PATH}images/spacer.gif"<!-- ELSE -->src="{UPLOAD_ICON_SRC}"<!-- ENDIF --> id="image_upload_icon" alt="" title="" />&nbsp;</dd>
</dl> </dl>
<dl> <dl>
<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt> <dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>

2
phpBB/adm/style/acp_icons.html
View file

@ -22,7 +22,7 @@
{ {
var use_element = smiley[newimage]; var use_element = smiley[newimage];
document.getElementById('add_image_src').src = '{PHPBB_ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage); document.getElementById('add_image_src').src = '{ROOT_PATH}{IMG_PATH}/' + encodeURI(newimage);
document.getElementById('add_code').value = use_element['code']; document.getElementById('add_code').value = use_element['code'];
document.getElementById('add_emotion').value = use_element['emotion']; document.getElementById('add_emotion').value = use_element['emotion'];
document.getElementById('add_width').value = use_element['width']; document.getElementById('add_width').value = use_element['width'];

1
phpBB/includes/acp/acp_attachments.php
View file

@ -748,7 +748,6 @@ class acp_attachments
} }
$template->assign_vars(array( $template->assign_vars(array(
'PHPBB_ROOT_PATH' => $phpbb_root_path,
'IMG_PATH' => $img_path, 'IMG_PATH' => $img_path,
'ACTION' => $action, 'ACTION' => $action,
'GROUP_ID' => $group_id, 'GROUP_ID' => $group_id,

1
phpBB/includes/acp/acp_icons.php
View file

@ -307,7 +307,6 @@ class acp_icons
'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'], 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'],
'IMG_PATH' => $img_path, 'IMG_PATH' => $img_path,
'PHPBB_ROOT_PATH' => $phpbb_root_path,
'CODE' => $default_row['code'], 'CODE' => $default_row['code'],
'EMOTION' => $default_row['emotion'], 'EMOTION' => $default_row['emotion'],

3
phpBB/includes/functions_acp.php
View file

@ -67,7 +67,8 @@ function adm_page_header($page_title)
'SID' => $SID, 'SID' => $SID,
'_SID' => $_SID, '_SID' => $_SID,
'SESSION_ID' => $user->session_id, '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_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'),
'U_ADM_LOGOUT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'), 'U_ADM_LOGOUT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout'),