| Index: trunk/phase3/maintenance/Maintenance.php |
| — | — | @@ -15,11 +15,12 @@ |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | // Make sure we're on PHP5 or better |
| 19 | | -if ( version_compare( PHP_VERSION, '5.0.0' ) < 0 ) { |
| 20 | | - die ( "Sorry! This version of MediaWiki requires PHP 5; you are running " . |
| | 19 | +if ( version_compare( PHP_VERSION, '5.1.0' ) < 0 ) { |
| | 20 | + die ( "Sorry! This version of MediaWiki requires PHP 5.1.x; you are running " . |
| 21 | 21 | PHP_VERSION . ".\n\n" . |
| 22 | | - "If you are sure you already have PHP 5 installed, it may be installed\n" . |
| 23 | | - "in a different path from PHP 4. Check with your system administrator.\n" ); |
| | 22 | + "If you are sure you already have PHP 5.1.x or higher installed, it may be\n" . |
| | 23 | + "installed in a different path from PHP " . PHP_VERSION . ". Check with your system\n" . |
| | 24 | + "administrator.\n" ); |
| 24 | 25 | } |
| 25 | 26 | |
| 26 | 27 | /** |
| Index: trunk/phase3/maintenance/install-utils.inc |
| — | — | @@ -19,8 +19,8 @@ |
| 20 | 20 | } |
| 21 | 21 | if ( version_compare( phpversion(), '5.1.0' ) < 0 ) { |
| 22 | 22 | echo "PHP 5.1.0 or higher is required. If PHP 5 is available only when \n" . |
| 23 | | - "PHP files have a .php5 extension, please navigate to <a href=\"index.php5\">index.php5</a> \n" . |
| 24 | | - "to continue installation. ABORTING.\n"; |
| | 23 | + "PHP files have a .php5 extension, please navigate to <a href=\"index.php5\">index.php5</a> \n" . |
| | 24 | + "to continue installation. ABORTING.\n"; |
| 25 | 25 | die( 1 ); |
| 26 | 26 | } |
| 27 | 27 | |
| Index: trunk/phase3/php5.php5 |
| — | — | @@ -4,6 +4,6 @@ |
| 5 | 5 | * Test for *.php5 capability in webserver |
| 6 | 6 | * Used by includes/templates/PHP4.php |
| 7 | 7 | */ |
| 8 | | -if ( version_compare( phpversion(), '5.0.0' ) >= 0 ) { |
| | 8 | +if ( version_compare( phpversion(), '5.1.0' ) >= 0 ) { |
| 9 | 9 | echo 'y'.'e'.'s'; |
| 10 | 10 | } |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -4492,7 +4492,6 @@ |
| 4493 | 4493 | } |
| 4494 | 4494 | |
| 4495 | 4495 | # Get the diff |
| 4496 | | - # Note that we simulate array_diff_key in PHP <5.0.x |
| 4497 | 4496 | $templates_diff = array_diff_key( $poTemplates, $tlTemplates ); |
| 4498 | 4497 | |
| 4499 | 4498 | if ( count( $templates_diff ) > 0 ) { |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | /** |
| 18 | 18 | * Compatibility functions |
| 19 | 19 | * |
| 20 | | - * We more or less support PHP 5.0.x and up. |
| | 20 | + * We support PHP 5.1.x and up. |
| 21 | 21 | * Re-implementations of newer functions or functions in non-standard |
| 22 | 22 | * PHP extensions may be included here. |
| 23 | 23 | */ |
| Index: trunk/phase3/includes/WebStart.php |
| — | — | @@ -89,16 +89,6 @@ |
| 90 | 90 | exit; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | | -# Test for PHP bug which breaks PHP 5.0.x on 64-bit... |
| 94 | | -# As of 1.8 this breaks lots of common operations instead |
| 95 | | -# of just some rare ones like export. |
| 96 | | -$borked = str_replace( 'a', 'b', array( -1 => -1 ) ); |
| 97 | | -if( !isset( $borked[-1] ) ) { |
| 98 | | - echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" . |
| 99 | | - "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n"; |
| 100 | | - exit; |
| 101 | | -} |
| 102 | | - |
| 103 | 93 | # Start the autoloader, so that extensions can derive classes from core files |
| 104 | 94 | require_once( "$IP/includes/AutoLoader.php" ); |
| 105 | 95 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3778,6 +3778,8 @@ |
| 3779 | 3779 | /** |
| 3780 | 3780 | * Regexp to match word boundaries, defaults for non-CJK languages |
| 3781 | 3781 | * should be empty for CJK since the words are not separate |
| | 3782 | + * |
| | 3783 | + * @todo FIXME: checks for lower than required PHP version (5.1.x). |
| 3782 | 3784 | */ |
| 3783 | 3785 | $wgSearchHighlightBoundaries = version_compare("5.1", PHP_VERSION, "<")? '[\p{Z}\p{P}\p{C}]' |
| 3784 | 3786 | : '[ ,.;:!?~!@#$%\^&*\(\)+=\-\\|\[\]"\'<>\n\r\/{}]'; // PHP 5.0 workaround |
| Index: trunk/phase3/includes/templates/PHP4.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | <h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ); ?></h1> |
| 60 | 60 | <div class='error'> |
| 61 | 61 | <p> |
| 62 | | - MediaWiki requires PHP 5.0.0 or higher. You are running PHP |
| | 62 | + MediaWiki requires PHP 5.1.x or higher. You are running PHP |
| 63 | 63 | <?php echo htmlspecialchars( phpversion() ); ?>. |
| 64 | 64 | </p> |
| 65 | 65 | <?php |