WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,636 Commits 50 Branches 749 Tags 982 MiB
Commit Graph

155 Commits

Author SHA1 Message Date
ryan d286875515 switch_to_blog() and restore_current_blog() housekeeping. 
wp-includes/admin-bar.php:

* Replace get_admin_url() and get_home_url() with admin_url() and home_url() and place them inside a switch/restore. Likewise replace current_user_can_for_blog() with current_user_can(). This avoids doing multiple switch restores.

wp-includes/ms-blogs.php:

* Deprecate the $validate argument to switch_to_blog(). This avoids a not very necessary call to get_blog_details(), possibly saving a few queries.
* Use $_wp_switched and $_wp_switched_stack instead of $switched and $switched_stack to make it less likely these globals will be stomped.
* Use GLOBALS to access blog_id and other globals. I've preferred this style lately since it makes it obvious a global is being used and avoids global blog_id being stomped by a local variable.
* Lose some is_object() checks. wp_get_current_user() always returns an object, for example.
* Call the new WP_Roles::reinit() method.

wp-includes/class-wp-xmlrpc-server.php:

* Replace current_user_can_for_blog() with current_user_can() and move it inside the switch/restore pair. This eliminates a switch/restore.

wp-includes/capabilities.php:

* Use array_keys() instead of $role => $data since $data is unused. I *think* this is a bit faster.
* Introduce WP_Roles::reinit(). This reinitializes WP_Roles and is used after switch_to_blog() has already update the blog ID in the wpdb object. If a global roles array is being used instead of the db, reinit is skipped.
* current_user_can_for_blog() now does a switch/restore. It didn't before meaning it could be reinitializing the user with the wrong role information for the current blog.

wp-includes/ms-settings.php:

* Define $_wp_switched_stack and $_wp_switched. This way switch_to_blog() and restore_current_blog() can rely on it being set.

wp-settings.php:

* Instantiate the WP_Roles global. This was it is always defined during init. To remove the WP_Roles checks from WP_Role and WP_User this would probably have to move before plugins are loaded, which might not be a good thing.

wp-includes/functions.php:

* Update wp_upload_dir() to reference _wp_switched.



git-svn-id: http://core.svn.wordpress.org/trunk@21485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-09 16:28:15 +00:00
nacin 7127ed1197 Move most instances of new WP_User to get_userdata(). see #21120. 
git-svn-id: http://core.svn.wordpress.org/trunk@21413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-03 01:06:05 +00:00
nacin fed9492cbc Use get_userdata() rather than new WP_User in is_super_admin(), to take advantage of the performance improvements in [21376]. see #21120. 
git-svn-id: http://core.svn.wordpress.org/trunk@21377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-31 17:47:08 +00:00
nacin fcae3978c3 Don't call get_userdata() every time for the current user in map_meta_cap()'s read_post, edit_post, and delete_post branches. see #21120. 
git-svn-id: http://core.svn.wordpress.org/trunk@21375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-31 17:39:14 +00:00
nacin 9d20dfc4e1 Enforce multisite plugins menu preference in map_meta_cap(). This means a simple current_user_can('activate_plugins') check will handle the 'Enable administration menus' setting. 
Remove bogus checks for enabling/disabling the 'themes' menu (something core does not handle out of the box) when in the network admin.

fixes #21123.



git-svn-id: http://core.svn.wordpress.org/trunk@21198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-30 12:40:25 +00:00
nacin 4add59f0c1 Remove 'fall through' points in map_meta_cap() as they can hide bugs. 
git-svn-id: http://core.svn.wordpress.org/trunk@21152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-27 19:27:54 +00:00
ryan 0a22489dc7 Fix warning when processing read_post cap. Props duck_. fixes #20917 
git-svn-id: http://core.svn.wordpress.org/trunk@21060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-12 13:50:51 +00:00
ryan d4311fb73e Make read_post more useful. Map read_post to edit_post for posts with protected post states. This makes read_post work naturally for draft, future, and pending posts belonging to other users. If the current user cannot edit these non-public posts then the user should not be able to read them either. 
git-svn-id: http://core.svn.wordpress.org/trunk@21046 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-10 16:21:44 +00:00
nacin bd1224eacf Update phpdoc for WP_User::has_cap(). props nunomorgadinho. see #19756. 
git-svn-id: http://core.svn.wordpress.org/trunk@20683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-05-02 14:17:04 +00:00
nacin 4fae1f64c2 Do not block file mod/edit caps when DISALLOW_UNFILTERED_HTML is set. There are separate constants (DISALLOW_FILE_EDIT and DISALLOW_FILE_MODS for those). fixes #20488. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-19 14:05:05 +00:00
ryan de41bc288b Introduce WP_User::exists(). see #20372 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-06 19:18:45 +00:00
ryan e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-08 17:01:11 +00:00
ryan 340e93324c Remove extraneous spaces. Props kenan3008, dimadin. fixes #19501 #19433 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-14 17:36:38 +00:00
ryan 07ff8b216b Use one space, not two, after trailing punctuation. fixes #19537 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-13 23:45:31 +00:00
duck_ 27a55d6459 Provide back compat mapping for user_level, wp_usersettings and wp_usersettingstime properties of WP_User objects. Fixes #19265. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-17 20:40:24 +00:00
nacin 68c443e9ee Remove dead code. empty() will catch anything that equals false. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-05 13:35:48 +00:00
ryan c1e7325db6 Avoid 'Only variables should be assigned by reference' warning. Props arena. fixes #18867 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-12 20:41:06 +00:00
ryan 8f50fdf79a Don't stomp meta fields in wp_update_user(). Props scribu. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-07 02:34:41 +00:00
duck_ e4ed63fc6f Fix typos in documentation (wp-includes/[a-h]). See #18560. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-03 16:02:41 +00:00
ryan 8edd1656f7 Handle null user ID in the WP_User constructor. Props kawauso. fixes #17894 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-24 19:47:35 +00:00
ryan 0f06334e11 Introduce metadata_exists(), WP_User::get_data_by(), WP_User::get(), WP_User::has_prop(). Don't fill user objects with meta. Eliminate data duplication in cache and memory. Props scribu. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-24 19:32:59 +00:00
ryan 902cbda424 Handle id back compat in isset magic method. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-05 20:54:08 +00:00
ryan ec4ccf2900 Deprecate get_userdatabylogin() and get_user_by_email(). Props scribu. fixes #18333 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-05 16:57:31 +00:00
ryan f5a33890bb Remove first_name and last_name properties. Props scribu. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-05 16:45:11 +00:00
ryan 8611d30e5e Handle deprecation of id in __set(). Props scribu. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-04 15:42:38 +00:00
ryan 6c81d023bb Add magic get/set/isset methods to WP_User to avoid data duplication. Standardize on WP_User::ID. Props scribu. see #15458 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-04 03:09:27 +00:00
ryan 1bea107db4 Remove return by ref from get_role(). Props scribu, elyobo. fixes #18237 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-07-28 17:12:18 +00:00
ryan 4ad0954961 Introduce register_meta(), get_metadata_by_mid(), and *_post_meta capabilities. fixes #17850 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-07-20 22:04:35 +00:00
markjaquith cfcde41182 Check parent caps for revisions. props aaroncampbell. fixes #17668 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-06-08 18:06:43 +00:00
ryan 04487fc268 Constructor cleanup. Props ocean90. fixes #16768 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-04-29 20:05:12 +00:00
ryan b60c345536 Remove PHP4 constructors. Props hakre. see #16768 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-04-05 17:25:08 +00:00
nacin 9845ee1fcd I have CDO. see #15779. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-14 11:25:11 +00:00
nacin cd51624aba Ensure the map_meta_cap filter receives the right cap when the map_meta_cap flag is false. fixes #15779. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-14 11:22:32 +00:00
ryan 104c9ed3d8 Make sure create_users is strippped from blog admins for multisite setups where add_new_users is not enabled. see #15357 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-23 16:29:21 +00:00
nacin e5f944a913 Don't check post_type_supports in map_meta_cap. see #14122. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-17 06:21:34 +00:00
nacin 795ab6d0f3 Cripple capability_type. Produced inconsistent, janky meta cap mapping; now only acts as a capability base. see #14122. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-10 14:50:14 +00:00
ryan d24a3cfe04 Always allow super admins to have create_users. see #15357 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-09 21:45:06 +00:00
ryan 9a9d29019d Introduce user_can(). Props simonwheatley. fixes #14602 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-05 17:04:46 +00:00
ryan e1a7cc966f Do not set role if it is the same. Props nickmomrik. fixes #14708 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-22 19:38:20 +00:00
nacin c46c3c4637 Only check the post author if the post type supports authors. see #14122. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-21 14:55:15 +00:00
nacin d27f272247 Rough first pass on map_meta_cap for custom post types. see #14122. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-21 14:40:04 +00:00
nacin 21f2b80f97 Use map_meta_cap for multisite super admins in current_user_can_for_blog. props jamescollins, see #15122. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-15 06:47:40 +00:00
ryan 9c31fd7c70 First pass of user admin. Network admin and screen cleanups. see #14696 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-07 19:34:18 +00:00
nacin 669b7b3e87 Provide an example for add_role() capabilities argument. props simonwheatley, fixes #14918. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-21 14:52:03 +00:00
nacin ca725961c5 More efficient is_super_admin(). Don't call new WP_User on the current user. props mdawaffe, fixes #14842. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-10 23:24:34 +00:00
scribu 449d62100e Introduce 'edit_comment' meta cap. Fixes #14520 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-07 23:35:28 +00:00
scribu 11ff3a7ce9 call get_users() from get_users_of_blog() 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-05 14:35:55 +00:00
nacin 713b3c1b82 Fix the delete_user meta cap. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-04 12:24:43 +00:00
nacin 2f90a8c63c Ensure we're checking when looking for is_super_admin() in map_meta_cap(). Bump DB version. 
fixes #14454 for trunk.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-29 21:58:58 +00:00
nacin 113a26770f Fix checking for whether WP_User object is actually a user. props filosofo, fixes #13903 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-13 21:27:05 +00:00