Ticket #23816: 23816.3.diff

wp-includes/class.wp-dependencies.php

@@ -174 +174 @@
                                 continue;
 
                         $keep_going = true;
-                        if ( !isset($this->registered[$handle]) )
+                        if ( !isset($this->registered[$handle]) ) {
                                 $keep_going = false; // Item doesn't exist.
-                        elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
+                        }
+                        elseif ( $this->registered[$handle]->deps && $missing = array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) {
                                 $keep_going = false; // Item requires dependencies that don't exist.
-                        elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
+                                $this->missing_dependencies( $handle, $missing );
+                        }
+                        elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) ) {
                                 $keep_going = false; // Item requires dependencies that don't exist.
+                        }
 
                         if ( ! $keep_going ) { // Either item or its dependencies don't exist.
                                 if ( $recursion )
@@ -201 +205 @@
         }
 
         /**
+         * Report missing dependencies for an item.
+         *
+         * @param string $handle Item handle.
+         * @param array $missing Handles of missing dependencies (array of strings).
+         */
+        public function missing_dependencies( $handle, $missing ) {
+                // No-op by default, override this in subclasses.
+        }
+
+        /**
          * Register an item.
          *
          * Registers the item if no item of that name already exists.

wp-includes/class.wp-scripts.php

@@ -47 +47 @@
         }
 
         /**
+         * Report missing dependencies for an item.
+         *
+         * @param string $handle Item handle.
+         * @param array $missing Handles of missing dependencies (array of strings).
+         */
+        public function missing_dependencies( $handle, $missing ) {
+                /**
+                 * Allow reporting of missing dependencies
+                 *
+                 * @param string $handle Script/style handle
+                 * @param array $missing List of missing dependencies
+                 * @param array $registered Dependencies registered
+                 */
+                do_action( 'wp_scripts_missing_dependency', $handle, $missing, $this->registered[$handle] );
+
+                if ( WP_DEBUG && apply_filters( 'scripts_missing_dependency_trigger_error', true ) ) {
+                        trigger_error( sprintf( __('Could not solve dependencies for script %1$s: missing %2$s'), $handle, implode( ', ', $missing ) ) );
+                }
+        }
+
+        /**
          * Prints scripts
          *
          * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.

wp-includes/class.wp-styles.php

@@ -39 +39 @@
                 do_action_ref_array( 'wp_default_styles', array(&$this) );
         }
 
+        /**
+         * Report missing dependencies for an item.
+         *
+         * @param string $handle Item handle.
+         * @param array $missing Handles of missing dependencies (array of strings).
+         */
+        public function missing_dependencies( $handle, $missing ) {
+                /**
+                 * Allow reporting of missing dependencies
+                 *
+                 * @param string $handle Script/style handle
+                 * @param array $missing List of missing dependencies
+                 * @param array $registered Dependencies registered
+                 */
+                do_action( 'wp_styles_missing_dependency', $handle, $missing, $this->registered[$handle] );
+
+                if ( WP_DEBUG && apply_filters( 'styles_missing_dependency_trigger_error', true ) ) {
+                        trigger_error( sprintf( __('Could not solve dependencies for style %1$s: missing %2$s'), $handle, implode( ', ', $missing ) ) );
+                }
+        }
+
         public function do_item( $handle ) {
                 if ( !parent::do_item($handle) )
                         return false;