Changeset 1125

Timestamp:

02/28/2008 12:40:56 AM (18 years ago)

Author:

sambauers

Message:

Better glob validity testing. Fixes #787. Props _ck_

Location:

trunk

Files:

• bb-admin/plugins.php (modified) (1 diff)
• bb-settings.php (modified) (2 diffs)

trunk/bb-admin/plugins.php

@@ -4 +4 @@
 $plugins = bb_get_plugins();
 $_plugins = array();
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) ) {
-    foreach ( glob(BBPLUGINDIR . '_*.php') as $_plugin ) {
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') ) {
+    foreach ( $_plugins_glob as $_plugin ) {
         $_data = bb_get_plugin_data( $_plugin );
         $_plugins[$_plugin] = $_data ? $_data : true;
     }
 }
+unset($_plugins_glob, $_plugin);
 
 $current = (array) bb_get_option( 'active_plugins' );

trunk/bb-settings.php

@@ -1 +1 @@
 <?php
 
-function bb_sanitize_version($version) {
-    $versions = array();
-    foreach (explode('.', $version) as $part) {
-        $part = preg_replace('@^([0-9]+)[^0-9]*$@', '$1', $part);
-        $versions[] = (integer) $part;
-    }
-    $version = join('.', $versions);
-    return (float) $version;
-}
-
-$phpversion = bb_sanitize_version( phpversion() );
-
-if ( $phpversion < 4.3 )
-    die(sprintf('Your server is running PHP version %s but bbPress requires at least 4.3', $phpversion) );
+if ( version_compare(PHP_VERSION, '4.3', '<') )
+    die(sprintf('Your server is running PHP version %s but bbPress requires at least 4.3', PHP_VERSION) );
 
 if ( !$bb_table_prefix )
@@ -381 +369 @@
 
 // Load Plugins
-if ( function_exists( 'glob' ) && is_callable( 'glob' ) )
-    foreach ( glob(BBPLUGINDIR . '_*.php') as $_plugin )
+if ( function_exists( 'glob' ) && is_callable( 'glob' ) && $_plugins_glob = glob(BBPLUGINDIR . '_*.php') )
+    foreach ( $_plugins_glob as $_plugin )
         require($_plugin);
-unset($_plugin);
+unset($_plugins_glob, $_plugin);
 do_action( 'bb_underscore_plugins_loaded' );