Check for preg_match() existence when installing and die out whining about PCRE if...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 63684f8..858f7c0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -568,6 +568,8 @@ Some default configuration options have changed:
   localizble extensions magic words.
 * Update to Romanian translation (ro)
 * Update to Esperanto translation (eo)
+* Check for preg_match() existence when installing and die out whining about PCRE
+  if it's not there, instead of throwing a fatal error
 
 == Compatibility ==
 

diff --git a/config/index.php b/config/index.php
index b76bda1..ebb210a 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -293,6 +293,10 @@ if( $conf->xml ) {
 if( !function_exists( 'session_name' ) )
        dieout( "PHP's session module is missing. MediaWiki requires session support in order to function." );
 
+# Likewise for PCRE
+if( !function_exists( 'preg_match' ) )
+       dieout( "The PCRE regular expression functions are missing. MediaWiki requires these in order to function." );
+
 $memlimit = ini_get( "memory_limit" );
 $conf->raiseMemory = false;
 if( empty( $memlimit ) || $memlimit == -1 ) {