Changeset 2709

Timestamp:

07/13/2005 10:26:26 PM (21 years ago)

Author:

ryan

Message:

Migrate to caps.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• edit-form-advanced.php (modified) (1 diff)
• edit.php (modified) (2 diffs)
• post.php (modified) (9 diffs)

trunk/wp-admin/admin-functions.php

@@ -498 +498 @@
     <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 (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
-    <td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), the_title('','',0)) . "')\">" . __('Delete') . "</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 confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), the_title('','',0)) . "')\">" . __('Delete') . "</a>"; } ?></td> 
   </tr> 
 

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

@@ -156 +156 @@
 if ('publish' != $post_status || 0 == $post_ID) {
 ?>
-<?php if ( user_can_create_post($user_ID) ) : ?>
+<?php if ( current_user_can('publish_posts') ) : ?>
         <input name="publish" type="submit" id="publish" tabindex="10" value="<?php _e('Publish') ?>" /> 
 <?php endif; ?>

trunk/wp-admin/edit.php

@@ -199 +199 @@
         case 'control_edit':
                 ?>
-                <td><?php if ( user_can_edit_post($user_ID,$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+                <td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
                 <?php
                 break;
@@ -205 +205 @@
         case 'control_delete':
                 ?>
-                <td><?php if ( user_can_edit_post($user_ID,$post->ID) ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), wp_specialchars(get_the_title('', ''), 1) ) . "')\">" . __('Delete') . "</a>"; } ?></td>
+                <td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), wp_specialchars(get_the_title('', ''), 1) ) . "')\">" . __('Delete') . "</a>"; } ?></td>
                 <?php
                 break;

trunk/wp-admin/post.php

@@ -70 +70 @@
                 die ( __('You are not allowed to edit this post.') );
 
-        if ( !user_can_edit_post($user_ID, $post_ID) )
-                die ( __('You are not allowed to view other users\' private posts.') );         
-
         $post = get_post_to_edit($post_ID);
         
@@ -121 +118 @@
         $post_id = (isset($_GET['post']))  ? intval($_GET['post']) : intval($_POST['post_ID']);
         
-        if (!user_can_delete_post($user_ID, $post_id)) {
+        if ( !current_user_can('edit_post', $post_id) ) 
                 die( __('You are not allowed to delete this post.') );
-        }
 
         if (! wp_delete_post($post_id))
@@ -146 +142 @@
                 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)'));
 
-        if ( !user_can_edit_post_comments($user_ID, $comment->comment_post_ID) )
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to edit comments on this post.') );
 
@@ -165 +161 @@
                 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
-        if ( !user_can_delete_post_comments($user_ID, $comment->comment_post_ID) )
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to delete comments on this post.') );
 
@@ -208 +204 @@
                          die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'post.php'));
 
-        if (!user_can_delete_post_comments($user_ID, $commentdata['comment_post_ID']))
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to edit comments on this post.') );
 
@@ -239 +235 @@
                 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
-        if ( !user_can_edit_post_comments($user_ID, $comment->comment_post_ID) )
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to edit comments on this post, so you cannot disapprove this comment.') );
 
@@ -259 +255 @@
                          die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
-        if ( !user_can_edit_post_comments($user_ID, $comment->comment_post_ID) )
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
@@ -285 +281 @@
                 die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
-        if ( !user_can_edit_post_comments($user_ID, $commentdata['comment_post_ID']))
+        if ( !current_user_can('edit_post', $comment->comment_post_ID) )        
                 die( __('You are not allowed to edit comments on this post, so you cannot approve this comment.') );
 
@@ -323 +319 @@
 <?php endif; ?>
 <?php
-        if ( user_can_create_draft($user_ID) ) {
+        if ( current_user_can('edit_posts') ) {
                 $action = 'post';
                 get_currentuserinfo();