Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-19 09:05:22 +01:00
Code Issues Projects Releases Wiki Activity
42,523 Commits 50 Branches 748 Tags 792 MiB
5d42748c18
Commit Graph

273 Commits

Author SHA1 Message Date
Jeremy Felt
3a7b5748eb Prevent wpmu_delete_blog from removing the wrong uploads directory 
`wp_upload_dir()` includes some logic to fall back to the default site's upload directory if a specific directory for the requested site cannot be found. Because of this, if `wpmu_delete_blog()` is fired twice in a row for the same site, the main site's upload directory could be deleted as well.

This adds some checks in `wpmu_delete_blog()` so that we are confident in the site and it's upload directory's existence before dropping the site. Tests are added for when `ms_files_rewriting` is enabled or disabled.

Fixes #30121

Built from https://develop.svn.wordpress.org/trunk@30404


git-svn-id: http://core.svn.wordpress.org/trunk@30399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-20 06:53:22 +00:00
Jeremy Felt
796ceebb25 Use common core syntax for checking DOING_AJAX 
Our current check for a non truthy `DOING_AJAX` is `! DOING_AJAX`.

props TobiasBg
Fixes #29891

Built from https://develop.svn.wordpress.org/trunk@30177


git-svn-id: http://core.svn.wordpress.org/trunk@30177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-02 02:24:23 +00:00
Scott Taylor
60b73c589c Display error message when Media Library upload fails. 
Props gcorne.
Fixes #29891.

Built from https://develop.svn.wordpress.org/trunk@30156


git-svn-id: http://core.svn.wordpress.org/trunk@30156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-11-01 20:25:23 +00:00
Drew Jaynes
f8657d5890 Remove redundant and erroneous @uses tag from most core inline documentation. 
Per our inline documentation standards, no further use of the `@uses` tag is recommended as used and used-by relationships can be derived through other means. This removes most uses of the tag in core documentation, with remaining tags to be converted to `@global` or `@see` as they apply.

Fixes #30191.

Built from https://develop.svn.wordpress.org/trunk@30105


git-svn-id: http://core.svn.wordpress.org/trunk@30105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-10-30 01:05:24 +00:00
Scott Taylor
d0a327b0b9 Make the URL output in _thickbox_path_admin_subfolder() use includes_url(). 
Props voldemortensen.
Fixes #14157.

Built from https://develop.svn.wordpress.org/trunk@29741


git-svn-id: http://core.svn.wordpress.org/trunk@29515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-09-12 22:31:18 +00:00
Scott Taylor
85bdc64173 In update_option_new_admin_email(), $email is set and never used. 
See #27882.


Built from https://develop.svn.wordpress.org/trunk@28299


git-svn-id: http://core.svn.wordpress.org/trunk@28127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-05-06 16:48:14 +00:00
Drew Jaynes
d77e78d685 Clean up duplicate hook notations and adjacency for calls to the wp_signup_location filter. 
Also adds braces missed in [25535].

See #26869.

Built from https://develop.svn.wordpress.org/trunk@28215


git-svn-id: http://core.svn.wordpress.org/trunk@28045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-04-25 07:12:14 +00:00
Andrew Nacin
c3ca81ba94 Always decode special characters for email subjects. 
props tlovett1, jeremyfelt.
fixes #25346.

Built from https://develop.svn.wordpress.org/trunk@27801


git-svn-id: http://core.svn.wordpress.org/trunk@27636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-28 02:44:15 +00:00
Andrew Nacin
156a5a234f Multisite: Don't set the $super_admins global in grant_super_admin(), revoke_super_admin(). 
Adds tests and docs.

props jdgrimes.
see #27205.

Built from https://develop.svn.wordpress.org/trunk@27706


git-svn-id: http://core.svn.wordpress.org/trunk@27545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-03-25 12:14:14 +00:00
Andrew Ozz
eb1d21d782 Remove all "valign" attributes from tables in wp-admin, props MikeHansenMe, Marventus. Fixes #22712. 
Built from https://develop.svn.wordpress.org/trunk@27029


git-svn-id: http://core.svn.wordpress.org/trunk@26905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2014-01-24 19:06:15 +00:00
Drew Jaynes
c9077348ee Inline documentation for hooks in wp-admin/includes/user.php. 
Props aaronholbrook for the initial patch.
Fixes #26099.

Built from https://develop.svn.wordpress.org/trunk@26503


git-svn-id: http://core.svn.wordpress.org/trunk@26397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-12-01 17:54:10 +00:00
Sergey Biryukov
74f77b85a6 Use get_current_site() instead of the $current_site global when possible. 
props jeremyfelt.
fixes #25158.
Built from https://develop.svn.wordpress.org/trunk@26120


git-svn-id: http://core.svn.wordpress.org/trunk@26032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-13 03:23:10 +00:00
Sergey Biryukov
eae4e5936f Use case-insensitive comparison for email addresses. fixes #25779. 
Built from https://develop.svn.wordpress.org/trunk@26115


git-svn-id: http://core.svn.wordpress.org/trunk@26027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-11-13 02:41:09 +00:00
Andrew Nacin
70fd806759 Revert r25824:25875 from the core.svn.wordpress.org repository. 
These commits were accidentally re-synced commits from develop.svn.wordpress.org due to a race condition. Thankfully, the history of this repository matters fairly little. It also happened only for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@25876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-25 02:29:52 +00:00
Andrew Nacin
5361a8abca Spell out duplicate hook locations. 
props DrewAPicture.
fixes #25658.

Built from https://develop.svn.wordpress.org/trunk@25868


git-svn-id: http://core.svn.wordpress.org/trunk@25868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-24 22:59:20 +00:00
Andrew Nacin
8ae8e01b67 Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone. 
see #27704.

Built from https://develop.svn.wordpress.org/trunk@25825


git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-24 22:53:14 +00:00
Ryan Boren
b87d4b77e5 Pinking shears 
Built from https://develop.svn.wordpress.org/trunk@25880


git-svn-id: http://core.svn.wordpress.org/trunk@25792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-23 14:38:10 +00:00
Andrew Nacin
74488bdcb0 Spell out duplicate hook locations. 
props DrewAPicture.
fixes #25658.

Built from https://develop.svn.wordpress.org/trunk@25868


git-svn-id: http://core.svn.wordpress.org/trunk@25780 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-10-22 17:22:11 +00:00
Sergey Biryukov
8595facd73 Some more tweaks for the documentation in wp-admin/includes/ms.php. see #25229. 
Built from https://develop.svn.wordpress.org/trunk@25497


git-svn-id: http://core.svn.wordpress.org/trunk@25418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-19 16:06:12 +00:00
Sergey Biryukov
27a75e12ad Update inline documentation for hooks in wp-admin/includes/ms.php. 
props jamescollins.
see #25229.
Built from https://develop.svn.wordpress.org/trunk@25486


git-svn-id: http://core.svn.wordpress.org/trunk@25407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-19 00:05:09 +00:00
Sergey Biryukov
37e3b91285 Inline documentation for hooks in wp-admin/includes/ms.php. 
props enej, DrewAPicture.
see #25229.
Built from https://develop.svn.wordpress.org/trunk@25481


git-svn-id: http://core.svn.wordpress.org/trunk@25402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-09-18 18:22:09 +00:00
Jon Cave
5c57c78afa Fix potential SQLi through improper use of API functions. 
git-svn-id: http://core.svn.wordpress.org/trunk@24875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-29 18:16:47 +00:00
Jon Cave
3999883feb Remove unnecessary secret_salt_warning(). 
If salts/keys are not defined in wp-config.php then they will be generated
automatically and stored in the database. [19771] also deals with values
that are duplicated or set to default.

Fixes #14803.


git-svn-id: http://core.svn.wordpress.org/trunk@24813 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-07-28 19:45:57 +00:00
Andrew Nacin
46097dec37 Pass blog_id to the wpmu_drop_tables filter. props mitchoyoshitaka. see #24320. 
git-svn-id: http://core.svn.wordpress.org/trunk@24245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-05-11 21:58:40 +00:00
Sergey Biryukov
f86b1502a0 Fix fatal error in WP_User_Query when searching users by URL. Move wp_is_large_network() to wp-includes. fixes #23683 for trunk. 
git-svn-id: http://core.svn.wordpress.org/trunk@23664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-12 09:19:55 +00:00
Ryan Boren
da7db424de Call them network upgrades rather than network updates to better indicate that they are DB upgrades rather than code/file upgrades. 
Improve the contextual help for the Network Upgrade screen.

Props DrewAPicture
fixes #23540


git-svn-id: http://core.svn.wordpress.org/trunk@23619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-03-05 17:02:31 +00:00
Andrew Nacin
55ba72f46e Confirm a user exists before deleting them in wp_delete_user() and wpmu_delete_user(). props scribu, fixes #23067. 
git-svn-id: http://core.svn.wordpress.org/trunk@23380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-02-02 04:41:02 +00:00
Ryan Boren
8dc401468e Make is_upload_space_available() available for front end page loads. Fixes fatal error when calling wp_editor() from the front end. 
Props scribu, itworx
fixes #22585


git-svn-id: http://core.svn.wordpress.org/trunk@22840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-26 14:42:43 +00:00
Peter Westwood
b2ca616d1e Multisite: Move all the functions which calculate upload space usage to wp-includes so they apply correctly with front-end editors. 
Fixes #22357 props wonderboymusic.


git-svn-id: http://core.svn.wordpress.org/trunk@22497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-09 10:35:42 +00:00
Andrew Nacin
32ad332432 Update Thickbox images for HiDPI. props lessbloat. see #21019. 
git-svn-id: http://core.svn.wordpress.org/trunk@22378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-05 21:00:15 +00:00
Peter Westwood
4f2173666d i18n: Fix the usage of sprintf replacements in the Multisite admin include files. See #22260. 
git-svn-id: http://core.svn.wordpress.org/trunk@22271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-10-23 11:28:36 +00:00
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
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
ryan
bc0947b075 Introduce get_super_admins(). Allow hard-coding a global super_admins array and bypassing site options. fixes #12815 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-23 20:34:03 +00:00
nbachiyski
16989ec444 Help translators with meaning of MB and GB. They are definitely not Macbook and Great Britain 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-21 17:44:21 +00:00
nacin
bf77b5c189 More grant/revoke super admin improvements. fixes #12933. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-09 08:26:16 +00:00
nacin
6eaa3b9637 Fix revoke_super_admin(). see #12933. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-09 07:17:42 +00:00
nacin
559a6e0855 Revert [14011]. Add some actions. fixes #12109, see #12460. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-08 04:15:58 +00:00
nacin
9ebf0afe13 Stop a dismissed admin notice feed from appearing on the next page load. see #12912. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-08 03:31:51 +00:00
wpmuguru
3e970343af add permission checks to grant/revoke_super_admin(), see #12109, related #12460 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14011 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-05 22:28:21 +00:00
dd32
8984530614 Update broken translation. S/post thumbnail/featured image/ 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-05 09:15:35 +00:00
nacin
c449adb237 File-level phpdoc for multisite files. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-04 13:29:35 +00:00
nacin
7b55c4688a Move add/remove super admin out of bulk edit and into user-edit.php. Introduce grant_super_admin() and revoke_super_admin(). Link to profile.php in ms-users user row for current user. Add defensive check by forcing IS_PROFILE_PAGE on user-edit if trying to edit your own user_id. see #12460 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 06:46:07 +00:00
markjaquith
d510d0bdc7 Huge MS refactoring and code cleanup. see #12460. props ocean90. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-01 21:21:27 +00:00
ryan
2cea68f079 Use get_home_url() and get_admin_url(). Props andreasnrb. see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-30 19:13:38 +00:00
ryan
8e4859a35c Use network_*_url(). see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-29 21:45:31 +00:00
nacin
f16de21ca5 Use correct var in MS dashboard_quota(). props ocean90, see #12710. also fixes sprintf string. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-26 21:50:54 +00:00
nacin
a7feaed0e6 Change @since 3.0 to @since 3.0.0. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-26 19:13:36 +00:00
nacin
e507f32dd4 Deprecate add_option_update_handler() and remove_option_update_handler() in favor of register_setting() and unregister_setting(). #11730 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-22 23:03:31 +00:00
nacin
243106b21e Fix the MS admin notice feed. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-22 02:23:45 +00:00
wpmuguru
64f48fd0bc add NONCE_SALT to secret_salt_warning(), see #11764 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-19 20:48:59 +00:00
ryan
e25a65b36a Trim trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 16:27:25 +00:00
wpmuguru
47302e0188 first pass on optional global terms, see #12589 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-16 17:17:55 +00:00
wpmuguru
6b18130fb2 move multisite upgrade functions to upgrade.php, see #11771 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 16:31:12 +00:00
wpmuguru
dec2715ca4 UI upgrade -> update, see #12517 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-04 23:28:15 +00:00
ryan
103a4f46b6 Remove site admin logged in notice. The new Super Admin menu makes that obvious enough. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-04 18:59:24 +00:00
nacin
01d4f4f18c Remove wp-content/blogs.php and add deprecated warning for MU admins. fixes #11742 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 20:29:24 +00:00
wpmuguru
210a5a70a1 more ms delete user tweaks, props ocean90, see #12386 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 19:24:25 +00:00
wpmuguru
0fc4e2c9c1 cleanup confirm delete users, props ocean90, fixes #12386 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 16:58:17 +00:00
wpmuguru
1c87155b6d warnings cleanup on archived/suspended sites, fixes #12396 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-27 17:48:37 +00:00
wpmuguru
ab6e21f6fb more multisite UI rebranding, See #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-26 19:08:01 +00:00
nacin
4e56d1c6a9 Switch over to *_user_meta() syntax. The old get_usermeta() would return a string when only one value was found, get_user_meta() requires $single = true. Fixes #10837 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-23 10:42:40 +00:00
nacin
2ce7dc4dac Don't use deprecated *_usermeta() functions. Props technosailor fixes #10837 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-22 21:25:32 +00:00
wpmuguru
a5a9f32b73 multisite UX, see #11644, add manage_ caps for super_admin, fixes #11803 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-22 18:41:38 +00:00
nacin
5656a345b9 Use esc_url() instead of clean_url(). See #12309 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-22 18:15:10 +00:00
dd32
679250491d Variable Cleanup, Unused variables, Typo'd variables, unused code blocks. Fixes #12299 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-20 02:01:46 +00:00
dd32
a6637d9c7a Update wpmu_delete_user() to use wp_delete_user()'s Link Deletion API, ensures that all actions and cleanups are run. See #12298 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-20 01:45:04 +00:00
nacin
84da5911aa Assume WP_DEBUG is defined in wpdb. Remove unnecessary constant() calls. Ensure DB_COLLATE defined as empty string doesn't override default Multisite collation. fixes #12041, see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-19 01:03:58 +00:00
nacin
b4f362264e Don't use deprecated functions. see #11388 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-13 10:35:10 +00:00
dd32
4430afb179 Cleanup admin_notice_feed(). Props nacin. Fixes #12138 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-05 14:00:18 +00:00
ryan
79007568a6 Merge mu_media_buttons() into media_buttons(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-04 20:28:52 +00:00
wpmuguru
059e60a37c add closing table cell tag to dashboard right now, props Simek, fixes #12121 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12940 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-03 23:06:27 +00:00
ryan
7a4d409064 Move functions to ms-deprecated.php 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-02 18:05:01 +00:00
ryan
8caab555bd Integrate update_profile_email() into user-edit.php. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-02 18:00:45 +00:00
wpmuguru
cfbffea85e minor fixes to populate_options(), UI tweaks, see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-01 20:01:14 +00:00
ryan
0f2060ef5d Move 'My Blogs' into its own file. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-29 23:21:01 +00:00
ryan
363da801f5 Integrate sitewide plugin handling into activate_plugins(), deactivate_plugins(), and plugins.php. fixes #11767 see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-29 21:45:32 +00:00
ryan
227168b639 Remove remove_edit_plugin_link(). Rely on cap checks. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-29 19:29:31 +00:00
ryan
cd57004569 Deprecate is_main_blog() for is_main_site(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 22:46:09 +00:00