From a43ead8ee7db832871db9cd2c4f294108398f4b0 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 26 Jul 2007 15:51:11 +0000 Subject: do not get too excited git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 4 +++- phpBB/adm/style/acp_attachments.html | 2 +- phpBB/adm/style/acp_bbcodes.html | 2 +- phpBB/adm/style/acp_bots.html | 6 +++--- phpBB/adm/style/acp_forums.html | 6 +++--- phpBB/adm/style/acp_groups.html | 4 ++-- phpBB/adm/style/acp_icons.html | 4 ++-- phpBB/adm/style/acp_language.html | 10 +++++----- phpBB/adm/style/acp_logs.html | 4 ++-- phpBB/adm/style/acp_modules.html | 6 +++--- phpBB/adm/style/acp_permission_roles.html | 2 +- phpBB/adm/style/acp_permissions.html | 16 ++++++++-------- phpBB/adm/style/acp_profile.html | 10 +++++----- phpBB/adm/style/acp_prune_forums.html | 2 +- phpBB/adm/style/acp_ranks.html | 2 +- phpBB/adm/style/acp_reasons.html | 4 ++-- phpBB/adm/style/acp_styles.html | 12 ++++++------ phpBB/adm/style/acp_users.html | 6 +++--- phpBB/adm/style/acp_users_feedback.html | 4 ++-- phpBB/adm/style/acp_words.html | 2 +- phpBB/adm/style/install_update_diff.html | 2 +- phpBB/adm/style/permission_trace.html | 2 +- phpBB/adm/swatch.php | 2 +- phpBB/cron.php | 2 +- phpBB/docs/CHANGELOG.html | 4 ++++ phpBB/download.php | 2 +- phpBB/faq.php | 2 +- phpBB/index.php | 2 +- phpBB/install/database_update.php | 3 ++- phpBB/install/index.php | 2 +- phpBB/language/en/ucp.php | 2 +- phpBB/mcp.php | 2 +- phpBB/memberlist.php | 2 +- phpBB/posting.php | 2 +- phpBB/report.php | 2 +- phpBB/search.php | 2 +- phpBB/style.php | 2 +- phpBB/styles/prosilver/template/mcp_post.html | 4 ++-- phpBB/styles/subsilver2/template/mcp_logs.html | 2 +- phpBB/styles/subsilver2/template/mcp_notes_user.html | 2 +- phpBB/ucp.php | 2 +- phpBB/viewforum.php | 2 +- phpBB/viewonline.php | 2 +- phpBB/viewtopic.php | 2 +- 44 files changed, 84 insertions(+), 77 deletions(-) (limited to 'phpBB') diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index ce8a54d6de..f99a2f8a73 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -15,7 +15,7 @@ define('ADMIN_START', true); define('NEED_SID', true); // Include files -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'common.' . $phpEx); require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); @@ -141,6 +141,8 @@ function adm_page_header($page_title) 'S_USER_LANG' => $user->lang['USER_LANG'], 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => 'UTF-8', + 'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', + 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', )); // application/xhtml+xml not used because of IE diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index cee60b4185..36d8f24f32 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -3,7 +3,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 4370b5e225..8d9827b672 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_ACP_BBCODES}

diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index a80c6db331..2f65a0fbec 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

@@ -85,11 +85,11 @@ -
+
-
+

{L_MARK_ALL} • {L_UNMARK_ALL}

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 5b06ff2cff..1aef98c36b 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -95,7 +95,7 @@ //--> - « {L_BACK} + « {L_BACK}

{L_TITLE} :: {FORUM_NAME}

@@ -316,7 +316,7 @@ - « {L_BACK} + « {L_BACK}

{L_FORUM_DELETE}

@@ -431,7 +431,7 @@ {forums.FOLDER_IMAGE} -
{forums.FORUM_IMAGE}
+
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME}
{forums.FORUM_DESCRIPTION}

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 3bdeaeaad0..a659207f9e 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_ACP_GROUPS_MANAGE}

@@ -160,7 +160,7 @@ - « {L_BACK} + « {L_BACK}

{L_GROUP_MEMBERS} :: {GROUP_NAME}

diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 81f56cc299..9c488c9f90 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -41,7 +41,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

@@ -137,7 +137,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index d15f722e98..c016251d38 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_SELECT_DOWNLOAD_FORMAT}

@@ -26,7 +26,7 @@ - « {L_BACK} + « {L_BACK}

{L_LANGUAGE_PACK_DETAILS}

@@ -107,12 +107,12 @@
-
+
-
+
 
@@ -166,7 +166,7 @@ - « {L_BACK} + « {L_BACK}

{L_UPLOAD_SETTINGS}

diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 19696c014a..e18c4882c5 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -72,8 +72,8 @@
-   -
+   +

{L_MARK_ALL} • {L_UNMARK_ALL}

diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 24abb5c8d3..3fafd1288b 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -55,7 +55,7 @@ //--> - « {L_BACK} + « {L_BACK}

{L_TITLE} :: {MODULENAME}

@@ -177,7 +177,7 @@ -
+
@@ -188,7 +188,7 @@ -
+
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 83256ff78d..e16d7598ab 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -22,7 +22,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 862ba6e8d2..5eb9c2eab3 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -108,7 +108,7 @@ -
+
@@ -138,7 +138,7 @@

{L_USERNAMES_EXPLAIN}

-
+
@@ -153,7 +153,7 @@ -
+
@@ -198,7 +198,7 @@ -
+

{L_USERS}

@@ -239,7 +239,7 @@
-
+

{L_USERGROUPS}

@@ -305,14 +305,14 @@
-
+
» {L_PERMISSION_TYPE}
-
+
{S_HIDDEN_FIELDS} {L_SELECT_TYPE}: @@ -340,7 +340,7 @@

-
+
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index e14e622080..bd9f0cc9a0 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

@@ -123,11 +123,11 @@
-
+
-
+
{S_HIDDEN_FIELDS}
@@ -146,11 +146,11 @@
-
+
-
+
{S_HIDDEN_FIELDS}
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 5629c11ff7..8d8f913b53 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -57,7 +57,7 @@ - « {L_BACK} + « {L_BACK}

{L_ACP_PRUNE_FORUMS}

diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index a8d496e257..bfb805f3d8 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK} - « {L_BACK} + « {L_BACK}

{L_EDIT}

@@ -280,7 +280,7 @@ //--> - « {L_BACK} + « {L_BACK}

{L_TEMPLATE_CACHE}

@@ -328,7 +328,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

@@ -455,7 +455,7 @@ - « {L_BACK} + « {L_BACK}

{L_TITLE}

diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 307ddb75e4..a7ac71abed 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -28,7 +28,7 @@ - « {L_BACK} + « {L_BACK}

{L_USER_ADMIN}

@@ -52,7 +52,7 @@ - « {L_BACK} + « {L_BACK}

{L_USER_ADMIN} :: {MANAGED_USERNAME}

@@ -207,7 +207,7 @@ -
+ diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index 0f64888170..e1d4076e4d 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -52,8 +52,8 @@
-   - +   +

{L_MARK_ALL} • {L_UNMARK_ALL}

diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index fa85669595..055a616f70 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -4,7 +4,7 @@ - « {L_BACK} + « {L_BACK}

{L_ACP_WORDS}

diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 799ca34292..ce1a241abe 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -239,7 +239,7 @@ table.hrdiff caption span {
-
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
+
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
{DIFF_CONTENT}
diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 93ef8553c8..186bb28b67 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -2,7 +2,7 @@
- « {L_BACK} + « {L_BACK}

{L_TRACE_FOR}: {PERMISSION_USERNAME} / {FORUM_NAME} / {PERMISSION}

diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 88da54d504..8573b9e530 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/cron.php b/phpBB/cron.php index 6c7b4311aa..b5a51a1688 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -12,7 +12,7 @@ */ define('IN_PHPBB', true); define('IN_CRON', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2095c588fa..86b342c982 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -282,6 +282,10 @@ p a {
  • [Fix] Added link to inbox for deleted PMs (Bug #13813)
    • + +
  • [Feature] Ability to externally set $phpbb_root_path if wrapping phpBB3 by defining constant PHPBB_ROOT_PATH
    • +
  • [Fix] Implemented correct left/right floating within ACP in regard to RTL languages (Bug #13777)
    • +
    diff --git a/phpBB/download.php b/phpBB/download.php index a1ee73f808..f02de8055a 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); if (isset($_GET['avatar'])) diff --git a/phpBB/faq.php b/phpBB/faq.php index b74ede66e4..f6d2ff3b8d 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/index.php b/phpBB/index.php index d2f54379e2..0ec1ecb177 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d255688f55..ffdedf0fd9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -10,6 +10,7 @@ $updates_to_version = '3.0.RC4'; +// Return if we "just include it" to find out for which version the database update is responsuble for if (defined('IN_PHPBB') && defined('IN_INSTALL')) { return; @@ -20,7 +21,7 @@ if (defined('IN_PHPBB') && defined('IN_INSTALL')) define('IN_PHPBB', true); define('IN_INSTALL', true); -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); // Report all errors, except notices diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 08e937f4cc..d2a806014d 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -15,7 +15,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); /**#@-*/ -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); // Report all errors, except notices diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 2d6aa8d28f..573102d6ca 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -34,7 +34,7 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.

    - Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “General Public License” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates Internet based discussions and the GPL strictly forbids them in what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: http://www.phpbb.com/.
    + Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “General Public License” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: http://www.phpbb.com/.

    You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised. ', diff --git a/phpBB/mcp.php b/phpBB/mcp.php index e2670c66c0..c772918dd7 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 486c99b3c0..c88845340b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); diff --git a/phpBB/posting.php b/phpBB/posting.php index 11cce9a451..7fa97be4c5 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); diff --git a/phpBB/report.php b/phpBB/report.php index cbae24b228..090dee5d0c 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); diff --git a/phpBB/search.php b/phpBB/search.php index d40dcebb1c..8dabfa895a 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/style.php b/phpBB/style.php index 23ebc55bd6..b33d473ae7 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'config.' . $phpEx); diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 9cfaa05db3..65798a89a8 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -180,8 +180,8 @@
    -   - +   +
    diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html index d759af5931..e163cf35d0 100644 --- a/phpBB/styles/subsilver2/template/mcp_logs.html +++ b/phpBB/styles/subsilver2/template/mcp_logs.html @@ -26,7 +26,7 @@ -   +   diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html index 54ddeb05be..fdc3bcd094 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_user.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_user.html @@ -80,7 +80,7 @@ -   +   diff --git a/phpBB/ucp.php b/phpBB/ucp.php index e3b665db2b..fcb9c9ec71 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'common.' . $phpEx); require($phpbb_root_path . 'includes/functions_user.' . $phpEx); diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 40ee637087..dc56afc7d6 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 65317b228c..f25afea1eb 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 2bf9d2090e..cafd07f66e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx); -- cgit v1.2.1