diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-17 14:43:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-17 14:43:49 +0000 |
| commit | e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180 (patch) | |
| tree | 6b648e11bca9d95f2b43ca50a75393973e57c9c2 /phpBB/includes | |
| parent | c6c3df2a730bb825a315c21cdd6c38988d683062 (diff) | |
| download | forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.gz forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.bz2 forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.tar.xz forums-e43b9d2f9baf0a4d92f9e9b70ab766fd248f7180.zip | |
removed debug_extra notice
other fixes
state that mysql.php shouldn't be used for mysql 4.1+ (actually, it should deny using it)
git-svn-id: file:///svn/phpbb/trunk@6377 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acm/acm_file.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/db/mysql.php | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index f74ab2707f..b8aed9bcb7 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -371,7 +371,7 @@ class acm } $db->sql_freeresult($query_result); - fwrite($fp, "<?php\n\n/*\n$query\n*/\n\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\n\$this->sql_rowset[\$query_id] = array(" . implode(',', $lines) . ') ?>'); + fwrite($fp, "<?php\n\n/*\n" . str_replace('*/', '*\/', $query) . "\n*/\n\n\$expired = (time() > " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\n\$this->sql_rowset[\$query_id] = array(" . implode(',', $lines) . ') ?>'); @flock($fp, LOCK_UN); fclose($fp); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index f71965e375..b1331fa1ae 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -489,12 +489,6 @@ class acp_main ); } - // Display debug_extra notice - if (defined('DEBUG_EXTRA')) - { - $template->assign_var('S_DEBUG_EXTRA', true); - } - // Warn if install is still present if (file_exists($phpbb_root_path . 'install')) { diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 48ae9e9773..099e1cf11a 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -26,7 +26,7 @@ if (!defined('SQL_LAYER')) /** * MySQL Database Abstraction Layer -* Minimum Requirement is 3.23+/4.0+/4.1+ +* Minimum Requirement is 3.23+/4.0+ (NOT 4.1+/5.0+) * @package dbal */ class dbal_mysql extends dbal |