aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2008-11-09 19:38:44 +0000
committerChris Smith <toonarmy@phpbb.com>2008-11-09 19:38:44 +0000
commit2b477bad8fd492f0be052f1019ae3a427ae263b4 (patch)
tree8f1ac28ac1c7eb02d814009fcca15b809f7b8ec5 /phpBB
parent33a0bb1edf2cd26b52336f429893945c38f4e4a8 (diff)
downloadforums-2b477bad8fd492f0be052f1019ae3a427ae263b4.tar
forums-2b477bad8fd492f0be052f1019ae3a427ae263b4.tar.gz
forums-2b477bad8fd492f0be052f1019ae3a427ae263b4.tar.bz2
forums-2b477bad8fd492f0be052f1019ae3a427ae263b4.tar.xz
forums-2b477bad8fd492f0be052f1019ae3a427ae263b4.zip
Provide a way to disable the config write check and rename the ACP style editor disable constant
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9056 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_main.php2
-rw-r--r--phpBB/includes/acp/acp_styles.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 8c3f3f4c63..d100c49381 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -485,7 +485,7 @@ class acp_main
$template->assign_var('S_REMOVE_INSTALL', true);
}
- if (file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writable($phpbb_root_path . 'config.' . $phpEx))
+ if (!defined('PHPBB_DISABLE_CONFIG_CHECK') && file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writable($phpbb_root_path . 'config.' . $phpEx))
{
// World-Writable? (000x)
$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002));
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 70c306014d..e0fb1459c2 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -679,7 +679,7 @@ parse_css_file = {PARSE_CSS_FILE}
{
global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template, $safe_mode;
- if (defined('DISABLE_ACP_EDITOR'))
+ if (defined('PHPBB_DISABLE_ACP_EDITOR'))
{
trigger_error($user->lang['EDITOR_DISABLED'] . adm_back_link($this->u_action));
}