Changeset 7441

Timestamp:

03/21/2008 04:10:01 AM (19 years ago)

Author:

markjaquith

Message:

better Apache mod detection from andy. fixes #6278

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -780 +780 @@
 
         // If Mac and mod_security, no Flash. :(
-        if ( function_exists('apache_getenv') && false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && 'on' == strtolower(apache_getenv('MODSEC_ENABLE')) )
+        $flash = true;
+        if ( false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security') )
                 $flash = false;
-        else
-                $flash = true;
 
         $post_id = intval($_REQUEST['post_id']);

trunk/wp-admin/includes/misc.php

@@ -2 +2 @@
 
 function got_mod_rewrite() {
-        global $is_apache;
-
-        // take 3 educated guesses as to whether or not mod_rewrite is available
-        if ( !$is_apache )
-                return false;
-
-        if ( function_exists( 'apache_get_modules' ) ) {
-                if ( !in_array( 'mod_rewrite', apache_get_modules() ) )
-                        return false;
-        }
-
-        return true;
+        return apache_mod_loaded('mod_rewrite');
 }
 

trunk/wp-includes/functions.php

@@ -1718 +1718 @@
         return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
 }
+
+/**
+ * apache_mod_loaded() - Does the specified module exist in the apache config?
+ *
+ * @param string $mod e.g. mod_rewrite
+ * @return bool
+ */
+function apache_mod_loaded($mod) {
+        global $is_apache;
+
+        if ( !$is_apache )
+                return false;
+
+        if ( function_exists('apache_get_modules') ) {
+                $mods = apache_get_modules();
+                if ( in_array($mod, $mods) )
+                        return true;
+        } else {
+                        ob_start();
+                        phpinfo(8);
+                        $phpinfo = ob_get_clean();
+                        if ( false !== strpos($phpinfo, $mod) )
+                                return true;
+        }
+        return false;
+}
+
 ?>