Commit Graph

119 Commits

Author SHA1 Message Date
nacin f708c5eaff Make wpmu_delete_blog() slightly less crappy. Prevents the entire network from being dropped in a particularly rare edge case. Removes some zombie code. fixes #19009.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-21 22:04:52 +00:00
ryan 69994de5d1 Consolidate larg network criteria into wp_is_large_network(). Allow plugins to change this criteria via filter. Props PeteMall. fixes #18464
git-svn-id: http://svn.automattic.com/wordpress/trunk@18871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-03 16:30:07 +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
nbachiyski f76ad7a71a Fix typo, fixes #17868, props rasheed2 and vanillalounge
git-svn-id: http://svn.automattic.com/wordpress/trunk@18337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-06-24 11:18:20 +00:00
ryan 9aeffe1487 Don't show _access_denied_splash() for network admin pages. Props sorich87. fixes #17511
git-svn-id: http://svn.automattic.com/wordpress/trunk@18009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-23 23:11:03 +00:00
ryan 2e2807147c Don't show _access_denied_splash() if the user has permissions for the site but insufficient perms for a particular page. Props sorich87. fixes #17514
git-svn-id: http://svn.automattic.com/wordpress/trunk@18008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-23 23:08:19 +00:00
nacin 567f0c21ec Use proper placeholders. No need to exit after wp_die(). fixes #17121.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-29 01:51:53 +00:00
ryan 06c03f44f0 Show access denied page and list a user's sites if they visit an admin they don't have permissions for rather than redirecting to the users' primary blog. fixes #17121
git-svn-id: http://svn.automattic.com/wordpress/trunk@17762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-29 00:43:48 +00:00
ryan 85f1feed84 Bring out the shears.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-06 04:11:14 +00:00
nacin 679051e9b0 Alter admin_notices usage in admin/includes/ms.php due to changes in the action with the network/user admin. props PeteMall, see #16063.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-04 07:26:57 +00:00
nacin e68063f9f3 Don't check the upload space site option if the option is disabled. props greuben, fixes #13601.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-20 16:44:33 +00:00
ryan e8468d167a Revert get_users_of_blog() to 3.0 behavior and deprecate. Use get_users() in core. Props scribu. fixes #15854
git-svn-id: http://svn.automattic.com/wordpress/trunk@17084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-20 16:25:35 +00:00
ryan 2cc6b2e7ff phpdoc notation fixes. Props demetris. fixes #15852
git-svn-id: http://svn.automattic.com/wordpress/trunk@17009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-16 22:46:13 +00:00
PeteMall 932ef80a9e s/<? /<?php / in [16963].
git-svn-id: http://svn.automattic.com/wordpress/trunk@16973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-15 23:21:07 +00:00
nacin 6c025aa06f Plugin install and thickbox for the network admin. props ocean90, fixes #15510, fixes #15750.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-15 18:48:40 +00:00
nacin 844636bf1c Don't show extra .0 in _deprecated_argument calls. They should appear in @since docs though.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-15 11:27:38 +00:00
ryan 3949ce12d0 Pink trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-13 21:21:50 +00:00
nacin a717edca97 Always exit after wp_redirect. props filosofo, fixes #15518.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-09 18:02:54 +00:00
nacin 8d00b7b63b s/can_edit_site/can_edit_network/g. see #15720.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-09 12:36:39 +00:00
westi 381a4f7750 Introduce can_edit_site to replace inline checks on whether or not the site_id is for the current Network. See #15716.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-07 14:28:40 +00:00
nacin 7ba61cbcd6 Use correct variable. props ocean90, fixes #15693.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-06 15:44:30 +00:00
ryan 0eeb985ef2 Deprecate and ignore the refresh arg. fixes #15605
git-svn-id: http://svn.automattic.com/wordpress/trunk@16673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-01 22:12:09 +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
ryan 2a7220b15a Revert [15717]; it had extra bits in it
git-svn-id: http://svn.automattic.com/wordpress/trunk@15718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-04 19:28:31 +00:00
ryan d78d29dfc4 Fix user edit urls for network admin
git-svn-id: http://svn.automattic.com/wordpress/trunk@15717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-04 19:26:40 +00:00
ryan b05ad69f63 Eliminate admin_notice_feed(). Props technosailor. fixes #14587
git-svn-id: http://svn.automattic.com/wordpress/trunk@15679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-01 18:34:25 +00:00
nacin 5a20c05d27 Phpdoc argument/@param cleanups. props duck_, see #14783.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 11:21:11 +00:00
ryan 11dc4a27bc Move confirm_delete_users() to edit.php. Update links in edit.php. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@15488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 18:10:43 +00:00
ryan 84ce78ab1f Move dashboard_quota in dashboard.php. Don't perform current_user_can check before init.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 17:56:05 +00:00
ryan 0490be0ae7 Remove show_post_thumbnail_warning
git-svn-id: http://svn.automattic.com/wordpress/trunk@15486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 17:29:34 +00:00
ryan 56b53ff30f Remove 'plugins page is not visible to normal users' notice. We're just not that into you.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 17:25:54 +00:00
ryan 44799523bc Update network upgrade links. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@15484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 15:36:57 +00:00
westi 5fdb333ab3 Ensure the language selection dropdown is output correctly. Fixes #14255 for trunk props SergeyBiryukov.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-10 07:25:10 +00:00
ryan 81e213c211 Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@15315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-24 15:01:29 +00:00
wpmuguru faf9bd8483 add create site link to My Sites page, original patch props filosofo, fixes #13852
git-svn-id: http://svn.automattic.com/wordpress/trunk@15228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-11 17:18:17 +00:00
wpmuguru a4ff4953aa die in non-async upload in [14716], see #12853
git-svn-id: http://svn.automattic.com/wordpress/trunk@14717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-18 01:34:01 +00:00
wpmuguru c5aab621a9 only die on async upload error, see #12853
git-svn-id: http://svn.automattic.com/wordpress/trunk@14716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-18 01:25:13 +00:00
wpmuguru 3d44d70aab observe fileupload_maxk in media uploader, see #12853
git-svn-id: http://svn.automattic.com/wordpress/trunk@14694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-16 20:09:56 +00:00
nacin b5c233a1b5 @since for some new ms functions re: upload file size limits. see #12853.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-04 08:41:46 +00:00
wpmuguru bc0ae7852f limit upload size to site's available limit, see #12853
git-svn-id: http://svn.automattic.com/wordpress/trunk@14420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 22:40:02 +00:00
ryan 7b7243d94a Strip trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:26:11 +00:00
ryan 172aa06718 Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051
git-svn-id: http://svn.automattic.com/wordpress/trunk@14374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 18:16:22 +00:00
ryan 91354eefee Escape links by default. Props alexkingorg. see #13051
git-svn-id: http://svn.automattic.com/wordpress/trunk@14347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-02 22:53:59 +00:00
nacin f92971a7ff Use the correct defines in secret_salt_warning.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-01 22:50:55 +00:00
nacin 6ebe054817 Show > 100% blog space used in MS Right Now.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-01 22:06:48 +00:00
nacin 0cfdd41300 Use a class for update-nag, as especially in MS we're sometimes hooking in more than one per page.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 15:37:46 +00:00
nacin bb3f1f5f45 Clean up secret_salt_warning. Use stronger version of wp_generate_password. Shrink line-height of #update-nag so multiple-line messages don't look so awful, use padding instead.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14318 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 15:25:54 +00:00
ryan ebc2200460 Remove debug
git-svn-id: http://svn.automattic.com/wordpress/trunk@14243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-26 18:52:14 +00:00
ryan b7543c5352 Hook update_option_new_admin_email to add_option_new_admin_email so that the confirmation email gets set even when new_admin_email doesn't already exist. see #12192
git-svn-id: http://svn.automattic.com/wordpress/trunk@14242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-26 18:20:11 +00:00
wpmuguru 821db5b0b0 escape the trailing underscore in SHOW TABLES LIKE in delete_blog, fixes #13099
git-svn-id: http://svn.automattic.com/wordpress/trunk@14215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-24 04:15:00 +00:00