Commit Graph

142 Commits

Author SHA1 Message Date
Ryan Boren
51920e1858 Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728
git-svn-id: http://core.svn.wordpress.org/trunk@22124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-05 19:04:34 +00:00
Ryan Boren
9fc9d42d0a * Register blog-id-cache group as global
* Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
* Don't db escape cache keys in get_blog_id_from_url()
* prepare() the query in get_blog_id_from_url()
* Return 0 for all failures in get_blog_id_from_url()
* clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.



git-svn-id: http://core.svn.wordpress.org/trunk@22092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-01 18:03:23 +00:00
Andrew Nacin
dc49f24a6c Remove ms-files.php rewriting from WordPress multisite. fixes #19235.
Keep existing networks compatible with a ms_files_rewriting network option.



git-svn-id: http://core.svn.wordpress.org/trunk@21823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-11 22:22:20 +00:00
Andrew Nacin
87c947a987 Use network_site_url() for wp-signup.php. props markjaquith. see #19796.
git-svn-id: http://core.svn.wordpress.org/trunk@21813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-11 12:27:25 +00:00
Ryan Boren
3205818a04 Add missing closedir() to wpmu_delete_blog(). Props timfs. fixes #21780
git-svn-id: http://core.svn.wordpress.org/trunk@21801 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-10 21:16:03 +00:00
westi
c702fe6657 Multisite: Fix the new get_space_used() function to correctly calculate Megabytes used and update some phpdoc. Props SergeyBiryukov.
git-svn-id: http://core.svn.wordpress.org/trunk@21474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 07:17:33 +00:00
ryan
5ca54e7d2f Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432


git-svn-id: http://core.svn.wordpress.org/trunk@21414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 17:51:42 +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
westi
4443baaab9 Multisite: Rework the upload space usage tracking code so as to be fully pluggable.
* Moves some admin only functions into wp-admin/includes/ms.php from wp-includes/ms-functions.php
 * Reworked the variable naming to be more in line with the Coding Standards
 * Introduced a new get_space_used() function instead of calculating it in multiple places.

Fixes #21181 props dllh and jkudish for inital work on this.


git-svn-id: http://core.svn.wordpress.org/trunk@21387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 13:52:06 +00:00
duck_
e506b3eaee wpmu_delete_user() should actually delete the user. Fixes #20792.
User meta is removed by delete_metadata_by_mid() already.


git-svn-id: http://core.svn.wordpress.org/trunk@20952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-30 16:14:57 +00:00
ryan
646cb4e2ce * Return empty arrays instead of false for all conditions in get_blogs_of_user().
* When deleting a user, use a delete_metadata_by_mid() loop over the meta so that the meta cache is cleared.
* Use remove_user_from_blog() for DRYness.

Props nacin, duck_
Fixes #19500


git-svn-id: http://svn.automattic.com/wordpress/trunk@20581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-24 22:13:47 +00:00
duck_
e641c48a72 Pass full user objects to clean_user_cache(). See #19500, fixes #20460.
Prevents notices when clean_user_cache() is called for a user that has been removed from the database.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-18 21:07:31 +00:00
nacin
959160e789 Remove step="" from upload size inputs, as the step is enforced in the spec, rather than being a recommendation. finally fixes #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-25 13:02:01 +00:00
nacin
0730535015 Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 15:24:31 +00:00
nacin
35ba4853bf Adjust site upload space HTML5 type='number' validation. see #17863.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-16 04:16:21 +00:00
azaozz
f3b63e4537 Set proper HTML5 input types in the admin, props georgestephanis, fixes #17863
git-svn-id: http://svn.automattic.com/wordpress/trunk@20168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-10 01:23:48 +00:00
nacin
d130a63e25 Introduce WP_Theme, wp_get_themes(), and wp_get_theme() to replace get_themes(), get_theme(), get_theme_data(), current_theme_info(), and others.
* Getters and Helpers: Introduces a series of methods to allow for easy generation of headers for display, and other theme metadata, including page templates.
 * Screenshots: Handles support for multiple screenshots. (see # Additional screenshots must be PNG and start with screenshot-2.png, and be sequential to be counted. see #19816.
 * Error Handling: Broken themes have a WP_Error object attached to them.
 * Caching: Introduces a wp_cache_themes_persistently filter (also in [20020]) to enable persistent caching of all filesystem and sanitization operations normally handled by WP_Theme (and formerly get_file_data() and get_themes()). Themes are cached individually and across five different cache keys for different data pieces.
 * Compatibility: A WP_Theme object is backwards compatible with a theme's array formerly returned by get_themes() and get_theme(), and an stdClass object formerly returned by current_theme_info().
 * i18n/L10n: Theme headers are now localizable with proper Text Domain and Domain Path headers, like plugins. (Language packs may remove the requirement for headers.) For page templates, see #6007 (not fixed yet, but will be easy now). For headers, fixes #15858.
 * PHP and CSS files: New methods that fetch a list of theme files (for the theme editor) only on demand, rather than only loading them into memory. fixes #11214.

Functions deprecated:
 * get_themes(), get_allowed_themes() and get_broken_themes() -- use wp_get_themes()
 * get_theme() and current_theme_info() -- use wp_get_theme()
 * get_site_allowed_themes() -- use WP_Theme::get_allowed_on_network()
 * wpmu_get_blog_allowedthemes() -- use WP_theme::get_allowed_on_site()

see also [20016], [20018], [20019], [20020], [20021], [20022], [20025], [20026], [20027]. also fixes #19244.

see #20103.



git-svn-id: http://svn.automattic.com/wordpress/trunk@20029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 21:24:44 +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
nacin
33f5a73a63 Revert half of [19639]. If the blog_upload_space site_option is '0', restore 50 as a default. see #19538.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-03 17:24:51 +00:00
nacin
7931ec33f1 Better checking for values for multisite upload limits. see #19538 for trunk.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-30 23:10:54 +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
markjaquith
2e2c07f094 Only fall back to get_site_option() if blog_upload_space value is === false. Zero should not fall back. fixes #18119. props jakub.tyrcha
git-svn-id: http://svn.automattic.com/wordpress/trunk@19314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-16 22:02:01 +00:00
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