Ticket #5924: move_func.diff

E:/EclipseWorkWeb/WordPressDev/wp-includes/plugin.php

@@ -593 +593 @@
-                return $function[0].$function[1];
-}
-
+
+/**
+ * add_meta_box() - Add a meta box to an edit form
+ *
+ * @since 2.5
+ *
+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string $title Title of the meta box
+ * @param string $callback Function that fills the box with the desired content.  The function should echo its output.
+ * @param string $page The type of edit page on which to show the box (post, page, link)
+ * @param string $context The context within the page where the boxes should show ('normal', 'advanced')
+ */
+function add_meta_box($id, $title, $callback, $page, $context = 'advanced') {
+        global $wp_meta_boxes;
+
+        if  ( !isset($wp_meta_boxes) )
+                $wp_meta_boxes = array();
+        if ( !isset($wp_meta_boxes[$page]) )
+                $wp_meta_boxes[$page] = array();
+        if ( !isset($wp_meta_boxes[$page][$context]) )
+                $wp_meta_boxes[$page][$context] = array();
+
+        $wp_meta_boxes[$page][$context][] = array('id' => $id, 'title' => $title, 'callback' => $callback);
+}
+
-?>

E:/EclipseWorkWeb/WordPressDev/wp-admin/includes/template.php

@@ -952 +952 @@
-                echo '<input type="hidden" id="wp-old-slug" name="wp-old-slug" value="' . $name . '" />';
-}
-
-/**
- * add_meta_box() - Add a meta box to an edit form
- *
- * @since 2.5
- *
- * @param string $id String for use in the 'id' attribute of tags.
- * @param string $title Title of the meta box
- * @param string $callback Function that fills the box with the desired content.  The function should echo its output.
- * @param string $page The type of edit page on which to show the box (post, page, link)
- * @param string $context The context within the page where the boxes should show ('normal', 'advanced')
- */
-function add_meta_box($id, $title, $callback, $page, $context = 'advanced') {
-        global $wp_meta_boxes;
-
-        if  ( !isset($wp_meta_boxes) )
-                $wp_meta_boxes = array();
-        if ( !isset($wp_meta_boxes[$page]) )
-                $wp_meta_boxes[$page] = array();
-        if ( !isset($wp_meta_boxes[$page][$context]) )
-                $wp_meta_boxes[$page][$context] = array();
-
-        $wp_meta_boxes[$page][$context][] = array('id' => $id, 'title' => $title, 'callback' => $callback);
-}
-
-function do_meta_boxes($page, $context, $object) {
-        global $wp_meta_boxes;
-