diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
| commit | d46e8e6f98054fc58a126c865184369198d9a2ed (patch) | |
| tree | f84899714e91ff360dcf16122d0ef723f5cefa15 /phpBB/install | |
| parent | 47b4b8346813312f99509d3f9d877c9cbf81b88b (diff) | |
| download | forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.gz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.bz2 forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.xz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.zip | |
merge revisions i missed... hopefully not breaking things - did not check every change.
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 7 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 3b62abacb0..d7dbad94b6 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -32,7 +32,7 @@ unset($dbpasswd); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.2', - 'phpbb_version' => '3.0.2', + 'phpbb_version' => '3.0.3', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b0b6efe62c..e43e8ad142 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.3-RC1'; +$updates_to_version = '3.0.3'; // 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')) @@ -78,7 +78,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) } else { - set_magic_quotes_runtime(0); + @set_magic_quotes_runtime(0); define('STRIP', (get_magic_quotes_gpc()) ? true : false); } @@ -340,6 +340,9 @@ $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); // Only an example, but also commented out $database_update_info = array( + + // No changes from 3.0.3-RC1 to 3.0.3 + '3.0.3-RC1' => array(), ); // Determine mapping database type diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index faf569482f..fce0350c31 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -418,7 +418,7 @@ class install_install extends module $location .= '/'; } - if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) + if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) { $img_imagick = str_replace('\\', '/', $location); continue; |