WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@532 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 17 insertions, 17 deletions

diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php
index 81ffe2d..aabf77e 100644
--- a/wp-inst/wp-admin/admin-functions.php
+++ b/wp-inst/wp-admin/admin-functions.php
@@ -643,19 +643,24 @@ function cat_rows($parent = 0, $level = 0, $categories = 0) {
 	}
 }
 
-function page_rows($parent = 0, $level = 0, $pages = 0) {
+function page_rows($parent = 0, $level = 0, $pages = 0, $hierarchy = true) {
 	global $wpdb, $class, $post;
+
 	if (!$pages)
 		$pages = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_type = 'page' ORDER BY menu_order");
 
-	if ($pages) {
-		foreach ($pages as $post) {
-			start_wp();
-			if ($post->post_parent == $parent) {
-				$post->post_title = wp_specialchars($post->post_title);
-				$pad = str_repeat('— ', $level);
-				$id = $post->ID;
-				$class = ('alternate' == $class) ? '' : 'alternate';
+	if (! $pages)
+		return false;
+
+	foreach ($pages as $post) {
+		setup_postdata($post);
+		if ( $hierarchy && ($post->post_parent != $parent) )
+			continue;
+
+		$post->post_title = wp_specialchars($post->post_title);
+		$pad = str_repeat('— ', $level);
+		$id = $post->ID;
+		$class = ('alternate' == $class) ? '' : 'alternate';
 ?>
   <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'> 
     <th scope="row"><?php echo $post->ID; ?></th> 
@@ -665,17 +670,12 @@ function page_rows($parent = 0, $level = 0, $pages = 0) {
     <td><?php the_author() ?></td>
     <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td> 
 	<td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
-    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
-    <td><?php if ( current_user_can('edit_pages') ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars(get_the_title('','',0), 1)) . "' );\">" . __('Delete') . "</a>"; } ?></td> 
+    <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
+    <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=delete&amp;post=$id' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), wp_specialchars(get_the_title('','',0), 1)) . "' );\">" . __('Delete') . "</a>"; } ?></td> 
   </tr> 
 
 <?php
-
-				page_rows($id, $level +1, $pages);
-			}
-		}
-	} else {
-		return false;
+		if ( $hierarchy) page_rows($id, $level + 1, $pages);
 	}
 }