Kill off some more old version checking stuffs

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 90403c2..53af63c 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4030,11 +4030,8 @@ $wgAdvancedSearchHighlighting = false;
 /**
  * Regexp to match word boundaries, defaults for non-CJK languages
  * should be empty for CJK since the words are not separate
- *
- * @todo FIXME: checks for lower than required PHP version (5.1.x).
  */
-$wgSearchHighlightBoundaries = version_compare("5.1", PHP_VERSION, "<")? '[\p{Z}\p{P}\p{C}]'
-       : '[ ,.;:!?~!@#$%\^&*\(\)+=\-\\|\[\]"\'<>\n\r\/{}]'; // PHP 5.0 workaround
+$wgSearchHighlightBoundaries = '[\p{Z}\p{P}\p{C}]';
 
 /**
  * Set to true to have the search engine count total

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index e07b5e1..18d08ea 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2762,9 +2762,6 @@ function wfCreateObject( $name, $p ) {
 
 function wfHttpOnlySafe() {
        global $wgHttpOnlyBlacklist;
-       if( !version_compare( '5.2', PHP_VERSION, '<' ) ) {
-               return false;
-       }
 
        if( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
                foreach( $wgHttpOnlyBlacklist as $regex ) {

diff --git a/includes/MWFunction.php b/includes/MWFunction.php
index 8a944df..1aad975 100644 (file)
--- a/includes/MWFunction.php
+++ b/includes/MWFunction.php
@@ -58,85 +58,13 @@ class MWFunction {
                
        }
        
-       public static function newObj( $class, $args = array(), $force_fallback = false ) {
+       public static function newObj( $class, $args = array() ) {
                if( !count( $args ) ) {
                        return new $class;
                }
-               
-               if ( version_compare( PHP_VERSION, '5.1.3', '<' ) || $force_fallback ) {
-               
-                       //If only MW needed 5.1.3 and up... sigh
-                       
-                       $args = array_values( $args );
-                       switch ( count( $args ) ) {
-                               case 0:
-                                       return new $class;
-                               case 1:
-                                       return new $class( $args[0] );
-                               case 2:
-                                       return new $class( $args[0], $args[1] );
-                               case 3:
-                                       return new $class( $args[0], $args[1], $args[2] );
-                               case 4:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3] );
-                               case 5:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4] );
-                               case 6:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5] );
-                               case 7:
-                                       return new $class( $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6] );
-                               case 8:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7] 
-                                       );
-                               case 9:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8] 
-                                       );
-                               case 10:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9]
-                                       );
-                               case 11:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10] 
-                                       );
-                               case 12:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11] 
-                                       );
-                               case 13:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12]
-                                       );
-                               case 14:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12], $args[13]
-                                       );
-                               case 15:
-                                       return new $class( 
-                                               $args[0], $args[1], $args[2], $args[3], $args[4], $args[5], $args[6], 
-                                               $args[7], $args[8], $args[9], $args[10], $args[11], $args[12], $args[13], 
-                                               $args[14]
-                                       );
-                               default:
-                                       throw new MWException( 'Too many arguments to construtor in MWFunction::newObj' );
-                       }
-               }
-       
-               else {
-       
-                       $ref = new ReflectionClass($class); 
-                       return $ref->newInstanceArgs($args);
-               }
-               
+
+               $ref = new ReflectionClass($class);
+               return $ref->newInstanceArgs($args);
        }
-       
+
 }