Changeset 16025 for trunk/wp-includes/functions.php

Timestamp:

10/27/2010 10:27:06 PM (15 years ago)

Author:

nacin

Message:

Use call_user_func for wpnique_filename callback. fixes #14627.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -2199 +2199 @@
  * unique.
  *
- * The callback must accept two parameters, the first one is the directory and
- * the second is the filename. The callback must be a function.
+ * The callback is passed three parameters, the first one is the directory, the
+ * second is the filename, and the third is the extension.
  *
  * @since 2.5
@@ -2206 +2206 @@
  * @param string $dir
  * @param string $filename
- * @param string $unique_filename_callback Function name, must be a function.
+ * @param mixed $unique_filename_callback Callback.
  * @return string New filename, if given wasn't unique.
  */
@@ -2222 +2222 @@
         $name = '';
 
-    // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
+    // Increment the file number until we have a unique file to save in $dir. Use callback if supplied.
     if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
-        $filename = $unique_filename_callback( $dir, $name );
+        $filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
     } else {
         $number = '';