Changes in trunk/wp-includes/plugin.php [14924:16955]

File:

• trunk/wp-includes/plugin.php (modified) (2 diffs)

trunk/wp-includes/plugin.php

@@ -657 +657 @@
  *
  * @param string $file
- * @param callback $callback The callback to run when the hook is called.
- */
-function register_uninstall_hook($file, $callback) {
+ * @param callback $callback The callback to run when the hook is called. Must be a static method or function.
+ */
+function register_uninstall_hook( $file, $callback ) {
+    if ( is_array( $callback ) && is_object( $callback[0] ) ) {
+        _doing_it_wrong( __FUNCTION__, __( 'Only a static class method or function can be used in an uninstall hook.' ), '3.1' );
+        return;
+    }
+
     // The option should not be autoloaded, because it is not needed in most
     // cases. Emphasis should be put on using the 'uninstall.php' way of
@@ -728 +733 @@
  * @param callback $function Used for creating unique id
  * @param int|bool $priority Used in counting how many hooks were applied.  If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
- * @param string $type filter or action
  * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniqe id.
  */