Changeset 6762

Timestamp:

02/08/2008 09:06:15 PM (17 years ago)

Author:

ryan

Message:

Separate meta box context into page and context to accommodate postbox API changes. see #5798

Location:

trunk/wp-admin

Files:

• edit-form-advanced.php (modified) (2 diffs)
• edit-link-form.php (modified) (2 diffs)
• edit-page-form.php (modified) (2 diffs)
• includes/template.php (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -220 +220 @@
 </div>
 
-<?php do_meta_boxes('edit_post', $post); ?>
+<?php do_meta_boxes('post', 'normal', $post); ?>
 
 <?php do_action('edit_form_advanced'); ?>
@@ -319 +319 @@
 <?php endif; ?>
 
-<?php do_meta_boxes('edit_post_advanced', $post); ?>
+<?php do_meta_boxes('post', 'advanced', $post); ?>
 
 <?php do_action('dbx_post_sidebar'); ?>

trunk/wp-admin/edit-link-form.php

@@ -99 +99 @@
 </div>
 </div>
+
+<?php do_meta_boxes('link', 'normal', $link); ?>
 
 <h2><?php _e('Advanced Options'); ?></h2>
@@ -275 +277 @@
 </div>
 
+<?php do_meta_boxes('link', 'advanced', $link); ?>
+
 <?php if ( $link_id ) : ?>
 <input type="hidden" name="action" value="save" />

trunk/wp-admin/edit-page-form.php

@@ -134 +134 @@
 </p>
 
+<?php do_meta_boxes('post', 'normal', $post); ?>
+
 <?php do_action('edit_page_form'); ?>
 
@@ -225 +227 @@
 <?php endif; ?>
 
+<?php do_meta_boxes('page', 'advanced', $post); ?>
+
 </div>
 

trunk/wp-admin/includes/template.php

@@ -854 +854 @@
  * @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 $context The context in which the box should be displayed.  edit_post, edit_page, edit_link, edit_post_advanced...
+ * @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, $context) {
+function add_meta_box($id, $title, $callback, $page, $context = 'advanced') {
     global $wp_meta_boxes;
 
-    $wp_meta_boxes[$context][] = array('id' => $id, 'title' => $title, 'callback' => $callback);
-}
-
-function do_meta_boxes($context, $object) {
+    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;
 
-    if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$context]) )
+    if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) )
         return;
 
-    foreach ( (array) $wp_meta_boxes[$context] as $box ) {
-        echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id']) . '">' . "\n";
+    foreach ( (array) $wp_meta_boxes[$page][$context] as $box ) {
+        echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . '">' . "\n";
         echo "<h3>{$box['title']}</h3>\n";
         echo '<div class="inside">' . "\n";
@@ -878 +886 @@
 }
 
-?>
+function test_box($post) {
+    echo "Hello $post->ID";
+}
+
+add_meta_box('test', 'Test', 'test_box', 'post');
+?>