diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-06-25 13:31:31 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-12-28 22:36:25 +0100 |
| commit | eda9fbbb6363cad0f2035b7a1f9fafe27f23832b (patch) | |
| tree | c023293935fd985b304c7047337fbbf236ea8644 /phpBB/includes/acp | |
| parent | 1e59666ee32fb00c709644f1f66d3c0b662f32a0 (diff) | |
| download | forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.gz forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.bz2 forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.xz forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.zip | |
[ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.
PHPBB3-9574
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 37 |
2 files changed, 4 insertions, 42 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 9eb594f301..b046424790 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -318,14 +318,11 @@ class acp_bbcodes $utf8 = strpos($bbcode_match, 'INTTEXT') !== false; // make sure we have utf8 support + // PHP may not be linked with the bundled PCRE lib and instead with an older version $utf8_pcre_properties = false; - if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) + if (@preg_match('/\p{L}/u', 'a') !== false) { - // While this is the proper range of PHP versions, PHP may not be linked with the bundled PCRE lib and instead with an older version - if (@preg_match('/\p{L}/u', 'a') !== false) - { - $utf8_pcre_properties = true; - } + $utf8_pcre_properties = true; } $fp_match = preg_quote($bbcode_match, '!'); diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index deff7d4a65..96542986d3 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -1007,43 +1007,8 @@ class sqlite_extractor extends base_extractor function write_data($table_name) { global $db; - static $proper; - if (is_null($proper)) - { - $proper = version_compare(PHP_VERSION, '5.1.3', '>='); - } - - if ($proper) - { - $col_types = sqlite_fetch_column_types($db->db_connect_id, $table_name); - } - else - { - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '" . $table_name . "'"; - $table_data = sqlite_single_query($db->db_connect_id, $sql); - $table_data = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', '', $table_data); - $table_data = trim($table_data); - - preg_match('#\((.*)\)#s', $table_data, $matches); - - $table_cols = explode(',', trim($matches[1])); - foreach ($table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - $column_name = preg_replace('/"?([^"]+)"?/', '\1', $entities[0]); - - // Hit a primary key, those are not what we need :D - if (empty($entities[1]) || (strtolower($entities[0]) === 'primary' && strtolower($entities[1]) === 'key')) - { - continue; - } - $col_types[$column_name] = $entities[1]; - } - } + $col_types = sqlite_fetch_column_types($db->db_connect_id, $table_name); $sql = "SELECT * FROM $table_name"; |