![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changes from trunk/wp-includes/capabilities.php at r16910 to branches/3.0/wp-includes/capabilities.php at r16631
- File:
-
- 1 edited
-
branches/3.0/wp-includes/capabilities.php (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/3.0/wp-includes/capabilities.php
r16910 r16631 472 472 * @param int|string $id User's ID or username 473 473 * @param int $name Optional. User's username 474 * @param int $blog_id Optional Blog ID, defaults to current blog.475 474 * @return WP_User 476 475 */ 477 function WP_User( $id, $name = '' , $blog_id = '') {476 function WP_User( $id, $name = '' ) { 478 477 479 478 if ( empty( $id ) && empty( $name ) ) … … 498 497 499 498 $this->id = $this->ID; 500 $this-> for_blog( $blog_id);499 $this->_init_caps(); 501 500 } 502 501 … … 606 605 foreach ( (array) $this->roles as $oldrole ) 607 606 unset( $this->caps[$oldrole] ); 608 609 if ( 1 == count( $this->roles ) && $role == $this->roles[0] )610 return;611 612 607 if ( !empty( $role ) ) { 613 608 $this->caps[$role] = true; … … 742 737 // Must have ALL requested caps 743 738 $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args ); 744 $capabilities['exist'] = true; // Everyone is allowed to exist745 739 foreach ( (array) $caps as $cap ) { 746 740 //echo "Checking cap $cap<br />"; … … 822 816 break; 823 817 case 'delete_post': 824 case 'delete_page':825 818 $author_data = get_userdata( $user_id ); 819 //echo "post ID: {$args[0]}<br />"; 826 820 $post = get_post( $args[0] ); 827 821 $post_type = get_post_type_object( $post->post_type ); 828 829 if ( ! $post_type->map_meta_cap ) { 830 $caps[] = $post_type->cap->$cap; 831 // Prior to 3.1 we would re-call map_meta_cap here. 832 if ( 'delete_post' == $cap ) 833 $cap = $post_type->cap->$cap; 834 break; 822 if ( $post_type && 'post' != $post_type->capability_type ) { 823 $args = array_merge( array( $post_type->cap->delete_post, $user_id ), $args ); 824 return call_user_func_array( 'map_meta_cap', $args ); 835 825 } 836 826 … … 838 828 $post_author_data = get_userdata( $post->post_author ); 839 829 } else { 840 // No author set yet, so default to current user for cap checks.830 //No author set yet so default to current user for cap checks 841 831 $post_author_data = $author_data; 842 832 } … … 846 836 // If the post is published... 847 837 if ( 'publish' == $post->post_status ) { 848 $caps[] = $post_type->cap->delete_published_posts;838 $caps[] = 'delete_published_posts'; 849 839 } elseif ( 'trash' == $post->post_status ) { 850 840 if ('publish' == get_post_meta($post->ID, '_wp_trash_meta_status', true) ) 851 $caps[] = $post_type->cap->delete_published_posts;841 $caps[] = 'delete_published_posts'; 852 842 } else { 853 843 // If the post is draft... 854 $caps[] = $post_type->cap->delete_posts;844 $caps[] = 'delete_posts'; 855 845 } 856 846 } else { 857 847 // The user is trying to edit someone else's post. 858 $caps[] = $post_type->cap->delete_others_posts;848 $caps[] = 'delete_others_posts'; 859 849 // The post is published, extra cap required. 860 850 if ( 'publish' == $post->post_status ) 861 $caps[] = $post_type->cap->delete_published_posts;851 $caps[] = 'delete_published_posts'; 862 852 elseif ( 'private' == $post->post_status ) 863 $caps[] = $post_type->cap->delete_private_posts; 853 $caps[] = 'delete_private_posts'; 854 } 855 break; 856 case 'delete_page': 857 $author_data = get_userdata( $user_id ); 858 //echo "post ID: {$args[0]}<br />"; 859 $page = get_page( $args[0] ); 860 $page_author_data = get_userdata( $page->post_author ); 861 //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />"; 862 // If the user is the author... 863 864 if ('' != $page->post_author) { 865 $page_author_data = get_userdata( $page->post_author ); 866 } else { 867 //No author set yet so default to current user for cap checks 868 $page_author_data = $author_data; 869 } 870 871 if ( is_object( $page_author_data ) && $user_id == $page_author_data->ID ) { 872 // If the page is published... 873 if ( $page->post_status == 'publish' ) { 874 $caps[] = 'delete_published_pages'; 875 } elseif ( 'trash' == $page->post_status ) { 876 if ('publish' == get_post_meta($page->ID, '_wp_trash_meta_status', true) ) 877 $caps[] = 'delete_published_pages'; 878 } else { 879 // If the page is draft... 880 $caps[] = 'delete_pages'; 881 } 882 } else { 883 // The user is trying to edit someone else's page. 884 $caps[] = 'delete_others_pages'; 885 // The page is published, extra cap required. 886 if ( $page->post_status == 'publish' ) 887 $caps[] = 'delete_published_pages'; 888 elseif ( $page->post_status == 'private' ) 889 $caps[] = 'delete_private_pages'; 864 890 } 865 891 break; … … 867 893 // edit_others_posts 868 894 case 'edit_post': 869 case 'edit_page':870 895 $author_data = get_userdata( $user_id ); 896 //echo "post ID: {$args[0]}<br />"; 871 897 $post = get_post( $args[0] ); 872 898 $post_type = get_post_type_object( $post->post_type ); 873 874 if ( ! $post_type->map_meta_cap ) { 875 $caps[] = $post_type->cap->$cap; 876 // Prior to 3.1 we would re-call map_meta_cap here. 877 if ( 'edit_post' == $cap ) 878 $cap = $post_type->cap->$cap; 879 break; 880 } 881 882 if ( '' != $post->post_author ) { 883 $post_author_data = get_userdata( $post->post_author ); 884 } else { 885 // No author set yet, so default to current user for cap checks. 886 $post_author_data = $author_data; 887 } 888 899 if ( $post_type && 'post' != $post_type->capability_type ) { 900 $args = array_merge( array( $post_type->cap->edit_post, $user_id ), $args ); 901 return call_user_func_array( 'map_meta_cap', $args ); 902 } 903 $post_author_data = get_userdata( $post->post_author ); 889 904 //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />"; 890 905 // If the user is the author... … … 892 907 // If the post is published... 893 908 if ( 'publish' == $post->post_status ) { 894 $caps[] = $post_type->cap->edit_published_posts;909 $caps[] = 'edit_published_posts'; 895 910 } elseif ( 'trash' == $post->post_status ) { 896 911 if ('publish' == get_post_meta($post->ID, '_wp_trash_meta_status', true) ) 897 $caps[] = $post_type->cap->edit_published_posts;912 $caps[] = 'edit_published_posts'; 898 913 } else { 899 914 // If the post is draft... 900 $caps[] = $post_type->cap->edit_posts;915 $caps[] = 'edit_posts'; 901 916 } 902 917 } else { 903 918 // The user is trying to edit someone else's post. 904 $caps[] = $post_type->cap->edit_others_posts;919 $caps[] = 'edit_others_posts'; 905 920 // The post is published, extra cap required. 906 921 if ( 'publish' == $post->post_status ) 907 $caps[] = $post_type->cap->edit_published_posts;922 $caps[] = 'edit_published_posts'; 908 923 elseif ( 'private' == $post->post_status ) 909 $caps[] = $post_type->cap->edit_private_posts; 924 $caps[] = 'edit_private_posts'; 925 } 926 break; 927 case 'edit_page': 928 $author_data = get_userdata( $user_id ); 929 //echo "post ID: {$args[0]}<br />"; 930 $page = get_page( $args[0] ); 931 $page_author_data = get_userdata( $page->post_author ); 932 //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />"; 933 // If the user is the author... 934 if ( is_object( $page_author_data ) && $user_id == $page_author_data->ID ) { 935 // If the page is published... 936 if ( 'publish' == $page->post_status ) { 937 $caps[] = 'edit_published_pages'; 938 } elseif ( 'trash' == $page->post_status ) { 939 if ('publish' == get_post_meta($page->ID, '_wp_trash_meta_status', true) ) 940 $caps[] = 'edit_published_pages'; 941 } else { 942 // If the page is draft... 943 $caps[] = 'edit_pages'; 944 } 945 } else { 946 // The user is trying to edit someone else's page. 947 $caps[] = 'edit_others_pages'; 948 // The page is published, extra cap required. 949 if ( 'publish' == $page->post_status ) 950 $caps[] = 'edit_published_pages'; 951 elseif ( 'private' == $page->post_status ) 952 $caps[] = 'edit_private_pages'; 910 953 } 911 954 break; 912 955 case 'read_post': 913 case 'read_page':914 $author_data = get_userdata( $user_id );915 956 $post = get_post( $args[0] ); 916 957 $post_type = get_post_type_object( $post->post_type ); 917 918 if ( ! $post_type->map_meta_cap ) { 919 $caps[] = $post_type->cap->$cap; 920 // Prior to 3.1 we would re-call map_meta_cap here. 921 if ( 'read_post' == $cap ) 922 $cap = $post_type->cap->$cap; 958 if ( $post_type && 'post' != $post_type->capability_type ) { 959 $args = array_merge( array( $post_type->cap->read_post, $user_id ), $args ); 960 return call_user_func_array( 'map_meta_cap', $args ); 961 } 962 963 if ( 'private' != $post->post_status ) { 964 $caps[] = 'read'; 923 965 break; 924 966 } 925 967 926 if ( 'private' != $post->post_status ) { 927 $caps[] = $post_type->cap->read; 968 $author_data = get_userdata( $user_id ); 969 $post_author_data = get_userdata( $post->post_author ); 970 if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) 971 $caps[] = 'read'; 972 else 973 $caps[] = 'read_private_posts'; 974 break; 975 case 'read_page': 976 $page = get_page( $args[0] ); 977 978 if ( 'private' != $page->post_status ) { 979 $caps[] = 'read'; 928 980 break; 929 981 } 930 982 931 if ( '' != $post->post_author ) { 932 $post_author_data = get_userdata( $post->post_author ); 933 } else { 934 // No author set yet, so default to current user for cap checks. 935 $post_author_data = $author_data; 936 } 937 938 if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) 939 $caps[] = $post_type->cap->read; 983 $author_data = get_userdata( $user_id ); 984 $page_author_data = get_userdata( $page->post_author ); 985 if ( is_object( $page_author_data ) && $user_id == $page_author_data->ID ) 986 $caps[] = 'read'; 940 987 else 941 $caps[] = $post_type->cap->read_private_posts; 942 break; 943 case 'edit_comment': 944 $comment = get_comment( $args[0] ); 945 $post = get_post( $comment->comment_post_ID ); 946 $post_type_object = get_post_type_object( $post->post_type ); 947 948 $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID ); 988 $caps[] = 'read_private_pages'; 949 989 break; 950 990 case 'unfiltered_upload': … … 995 1035 break; 996 1036 case 'create_users': 997 if ( !is_multisite() ) 1037 if ( is_multisite() && !get_site_option( 'add_new_users' ) ) 1038 $caps[] = 'do_not_allow'; 1039 else 998 1040 $caps[] = $cap; 999 elseif ( is_super_admin() || get_site_option( 'add_new_users' ) )1000 $caps[] = $cap;1001 else1002 $caps[] = 'do_not_allow';1003 1041 break; 1004 1042 default: 1005 // Handle meta capabilities for custom post types.1006 $post_type_meta_caps = _post_type_meta_capabilities();1007 if ( isset( $post_type_meta_caps[ $cap ] ) ) {1008 $args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );1009 return call_user_func_array( 'map_meta_cap', $args );1010 }1011 1012 1043 // If no meta caps match, return the original cap. 1013 1044 $caps[] = $cap; … … 1089 1120 1090 1121 /** 1091 * Whether a particular user has capability or role.1092 *1093 * @since 3.1.01094 *1095 * @param int|object $user User ID or object.1096 * @param string $capability Capability or role name.1097 * @return bool1098 */1099 function user_can( $user, $capability ) {1100 if ( ! is_object( $user ) )1101 $user = new WP_User( $user );1102 1103 if ( ! $user || ! $user->ID )1104 return false;1105 1106 $args = array_slice( func_get_args(), 2 );1107 $args = array_merge( array( $capability ), $args );1108 1109 return call_user_func_array( array( &$user, 'has_cap' ), $args );1110 }1111 1112 /**1113 1122 * Retrieve role object. 1114 1123 * … … 1136 1145 * @param string $role Role name. 1137 1146 * @param string $display_name Display name for role. 1138 * @param array $capabilities List of capabilities , e.g. array( 'edit_posts' => true, 'delete_posts' => false );1147 * @param array $capabilities List of capabilities. 1139 1148 * @return null|WP_Role WP_Role object if role is added, null if already exists. 1140 1149 */ … … 1193 1202 */ 1194 1203 function is_super_admin( $user_id = false ) { 1195 if ( $user_id )1196 $ user = new WP_User( $user_id);1197 else1198 $user = wp_get_current_user();1199 1200 if ( empty( $user->id ))1204 if ( ! $user_id ) { 1205 $current_user = wp_get_current_user(); 1206 $user_id = ! empty($current_user) ? $current_user->id : 0; 1207 } 1208 1209 if ( ! $user_id ) 1201 1210 return false; 1211 1212 $user = new WP_User($user_id); 1202 1213 1203 1214 if ( is_multisite() ) {
Note:
See TracChangeset
for help on using the changeset viewer.
