Ticket #26909: patch_commit_8d334f227fb2.patch

wp-admin/includes/plugin.php

@@ -83 +83 @@
                 'Network' => 'Network',
                 // Site Wide Only is deprecated in favor of Network.
                 '_sitewide' => 'Site Wide Only',
+                'WPRequirement' => 'WP Requirement',
+                'PHPRequirement' => 'PHP Requirement',
+                'MySQLRequirement' => 'MySQL Requirement'
         );
 
         $plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
@@ -533 +536 @@
         if ( is_wp_error($valid) )
                 return $valid;
 
+        $valid = plugin_requirements_check($plugin);
+        if ( is_wp_error($valid) )
+                return $valid;
+
         if ( !in_array($plugin, $current) ) {
                 if ( !empty($redirect) )
                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
@@ -883 +890 @@
 }
 
 /**
+ * Checks if the plugin has a requirement.
+ *      
+ * @since 3.0.0
+ *
+ * @param string $plugin Plugin Path
+ * @return WP_Error|int 0 on success, WP_Error on failure.
+ */
+function plugin_requirements_check( $plugin ) {
+        $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+
+        $errors = new WP_Error();
+
+        if ( isset( $plugin_data['WPRequirement'] ) ) {
+                $wp_version = version_compare( get_bloginfo( 'version' ), $plugin_data['WPRequirement'], '>=' );
+                if ( ! $wp_version )
+                        $errors->add( 'requirement_error', sprintf( __('WordPress %s or higher'), $plugin_data['WPRequirement'] ) );
+        }
+
+        if ( isset( $plugin_data['PHPRequirement'] ) ) {
+                $php_version = version_compare( phpversion(), $plugin_data['PHPRequirement'], '>=' );
+                if ( ! $php_version )
+                        $errors->add( 'requirement_error', sprintf( __('PHP Version %s or higher'), $plugin_data['PHPRequirement'] ) ); 
+        }
+
+        if ( isset( $plugin_data['MySQLRequirement'] ) ) {
+                $php_version = version_compare( phpversion(), $plugin_data['MySQLRequirement'], '>=' );
+                if ( ! $php_version )
+                        $errors->add( 'requirement_error', sprintf( __('MySQL Version %s or higher'), $plugin_data['MySQLRequirement'] ) );     
+        }
+
+        if ( $errors->get_error_code() )
+                return $errors;
+
+        return;
+        
+}
+
+/**
  * Whether the plugin can be uninstalled.
  *
  * @since 2.7.0

wp-admin/plugins.php

@@ -43 +43 @@
                                         $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
                                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
                                         exit;
+                                } elseif ( 'requirement_error' == $result->get_error_code() ) {
+                                        $redirect = self_admin_url('plugins.php?error=true&errormsg=Plugin Requires: ' . urlencode( implode( ' & ', $result->get_error_messages() ) ) . ".&plugin_status=$status&paged=$page&s=$s");
+                                        wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+                                        exit;
                                 } else {
                                         wp_die($result);
                                 }
@@ -372 +376 @@
                 $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
         elseif ( isset($_GET['charsout']) )
                 $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
+        elseif ( isset($_GET['errormsg']) )
+                $errmsg = $_GET['errormsg'];
         else
                 $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
         ?>