Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-13 22:26:06 +01:00
Code Issues Projects Releases Wiki Activity
33,026 Commits 50 Branches 748 Tags 792 MiB
8ba41a24ee
Commit Graph

279 Commits

Author SHA1 Message Date
Mark Jaquith
6b6ba31884 Properly wipe capabilities from new site-independent multisite users by using the right key. 
props wonderboymusic. fixes #15627

git-svn-id: http://core.svn.wordpress.org/trunk@23307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2013-01-18 15:30:55 +00:00
Andrew Nacin
72d8ca4770 Use $current_site->path instead of $base in wpmu_validate_blog_signup(), as $base is now dead. props MarkJaquith. fixes #22787. see #19796. 
git-svn-id: http://core.svn.wordpress.org/trunk@23107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-12-06 09:43:52 +00:00
Andrew Nacin
3287c609a1 Make the return of is_upload_space_available() more obvious. props georgestephanis. see #22585. 
git-svn-id: http://core.svn.wordpress.org/trunk@22861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-27 03:42: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
1d312da957 Fix the matching in is_email_address_unsafe(), which was too aggressive. 
We should only check to see if the user's email address has the same
domain as or is a subdomain of any banned email domain.

Add a filter.

props mdawaffe.
fixes #21570.



git-svn-id: http://core.svn.wordpress.org/trunk@22461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-08 01:06:17 +00:00
Andrew Nacin
dc40f18228 Merge some strings. props pavelevap. fixes #22306. 
git-svn-id: http://core.svn.wordpress.org/trunk@22430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-07 19:37:54 +00:00
Andrew Nacin
3a86c87c31 Remove single-argument calls to wpdb:prepare(), which are invalid as nothing is being prepared. see #22262. 
git-svn-id: http://core.svn.wordpress.org/trunk@22428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-11-07 19:28:08 +00:00
Ryan Boren
04a1ea0b39 Consolidate some transalted strings. Remove unnecessary trailing newlines. Props pavelevap. fixes #22274 
git-svn-id: http://core.svn.wordpress.org/trunk@22308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-10-25 22:21:15 +00:00
Peter Westwood
d30f0445e8 i18n: Fix the usage of sprintf replacements in the Multisite include files. See #22260. 
git-svn-id: http://core.svn.wordpress.org/trunk@22270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-10-23 11:27:20 +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
Andrew Nacin
61e0dc0122 Use 2 * DAY_IN_SECONDS rather than 172800. props pavelevap. fixes #20987. 
git-svn-id: http://core.svn.wordpress.org/trunk@22121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-10-05 13:11:16 +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
Ryan Boren
115d53941b Add domain_exists filter. Props jamescollins. fixes #21142 
git-svn-id: http://core.svn.wordpress.org/trunk@22065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-27 17:30:34 +00:00
Andrew Nacin
557d9313a7 Introduce constants to allow for easier expression of time periods in seconds. Adds MINUTE_IN_SECONDS, HOUR_IN_SECONDS, DAY_IN_SECONDS, WEEK_IN_SECONDS, YEAR_IN_SECONDS. props nbachiyski, SergeyBiryukov. fixes #20987. 
git-svn-id: http://core.svn.wordpress.org/trunk@21996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-25 05:26:19 +00:00
Ryan Boren
1513f1daea Suppress db errors when checking if the blog is already installed in install_blog(). Use DESCRIBE instead of SELECT. Props bpetty. fixes #21922 
git-svn-id: http://core.svn.wordpress.org/trunk@21924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-20 13:39:46 +00:00
Andrew Nacin
7ae797b119 Pass the user parameter to the wpmu_validate_blog_signup filter and wpmu_validate_blog_signup()'s return array. props BrianLayman. fixes #17306. 
git-svn-id: http://core.svn.wordpress.org/trunk@21860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-15 20:05:58 +00:00
Andrew Nacin
923b3e8e0e Pass current network ID to domain_exists() in wpmu_validate_blog_signup(). props larysa, fixes #17303. 
git-svn-id: http://core.svn.wordpress.org/trunk@21853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-09-15 19:29:59 +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
Ryan Boren
c55cf716da Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759 
git-svn-id: http://core.svn.wordpress.org/trunk@21664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-30 13:33:00 +00:00
Ryan Boren
2ea0626e5d Use switch_to_blog()/restore_current_blog() in get_blog_post() and get_blog_permalink(). Eliminate the duplicate caching in these functions. Return WP_Post from get_blog_post(). Update phpdoc. Remove global-posts cache invalidation. Props jondavidjohn fixes #21595 
git-svn-id: http://core.svn.wordpress.org/trunk@21628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-27 16:22:45 +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
markjaquith
3b46a53530 Do not block XML-RPC uploads when upload_space_check_disabled is true, regardless of fileupload_maxk value. props SergeyBiryukov. fixes #16217 
git-svn-id: http://core.svn.wordpress.org/trunk@21237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-09 03:49:23 +00:00
nacin
b28de3ea1b install_blog() should not be polluting the siteurl and home options with the trailing slash that comes from get_blogaddress_by_id(). 
git-svn-id: http://core.svn.wordpress.org/trunk@21172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-06-28 20:38:16 +00:00
ryan
30e6bb654d Rolling upgrade to set the welcome_user_email network-wide option via the welcome_user_msg_filter() callback. Fixes ability to save the welcome user email when no entry exists in the database. see #20116 
git-svn-id: http://core.svn.wordpress.org/trunk@20697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-05-02 20:31:37 +00:00
nacin
c68f8c46f0 Use maybe_serialize() where appropriate. fixes #19617. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-27 15:57:51 +00:00
ryan
80eb4cbe9b Add terminal punctuation to some signup error messages. Props dllh. fixes #20332 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-11 20:41:59 +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
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
ae113fba5e Pass WP_User object to the newuser_notify_siteadmin filter. props boonebgorges. fixes #20162. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-02 23:52:19 +00:00
nacin
86596214bd Simplify matching code. see #19670. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-07 17:44:29 +00:00
ryan
1438d03330 Fix notices. Simplify checkbox logic. Props SergeyBiryukov. fixes #19670 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-07 17:12:46 +00:00
duck_
e1068113ac Remove redundant logic from filter_SSL(). Props deltafactory. Fixes #19899. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-26 09:21:44 +00:00
nacin
b96deccca8 Use get_blog_prefix() in another MU function. see #19891. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-25 00:10:46 +00:00
nacin
b925695170 Use get_blog_prefix() in get_most_recent_post_of_user(). see #19891. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-25 00:09:30 +00:00
nacin
18804349bb Remove copy-pasted comment from upload_is_user_over_quota()'s phpdoc. It came from recurse_dirsize(). see #19879. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-24 23:54:24 +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
duck_
34b7010df8 Fix some mismatching parameter documentation. Props akshayagarwal, linuxologos. See #19756. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-06 11:42:00 +00:00
ryan
aa8a3f89d8 Use home_url() instead of site_url(). Props johnbillion. fixes #18293 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-04 19:29:03 +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
nacin
cc50764a8b They call me multisite. props ryan, zeo. see #19020. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-12-01 00:36:19 +00:00
nacin
56d46a1fe1 Send $user_id to is_super_admin() when checking to set primary_blog for a user in wpmu_create_blog(). see #19127. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-05 20:23:55 +00:00
ryan
b957c72f9a Turn is_blog_user() into a wrapper around is_user_member_of_blog() and deprecate. Make user_id optional for is_user_member_of_blog(). Props SergeyBiryukov. fixes #16702 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-19 22:35:15 +00:00
ryan
a0f6c4469d Introduce wp_get_db_schema() for rerieving the various flavors of the WP db schema. Eliminates need to use global. Allows multiple calls to wpmu_create_blog(). see #12028 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-10-06 00:21:24 +00:00
markjaquith
37e23be4ed Be more consistent with ERROR: messages. fixes #15887 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-30 17:18:35 +00:00
ryan
6febc018a9 Deprecate wpmu_admin_redirect_add_updated_param() and wpmu_admin_do_redirect(). Props SergeyBiryukov. fixes #18619 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-30 15:13:13 +00:00
nacin
6edb31db27 Ensure we have a full blog object in get_active_blog_for_user(). fixes #18789. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-27 07:36:36 +00:00
duck_
37441fac3e Fix copy+paste error in documentation. Props masonjames, SergeyBiryukov. Fixes #18545. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-24 19:37:34 +00:00
nacin
a4c18fc053 Use untrailingslashit in url_shorten() and recurse_dirsize(). Remove unnecessary camelCase variables. see #18592. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-05 16:53:19 +00:00
nacin
e53fe816b2 Instantiate some MS variables as objects before using them. Spaces not tabs for vertical alignment. Remove unnecessary conditional piece. props PeteMall, see #18049. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-17 17:49:57 +00:00
nacin
90f6899dd1 Use preg_match more efficiently. props solarissmoke, fixes #17287. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-10 19:18:18 +00:00
ryan
ef0ace0bbf Return true upon success in remove_user_from_blog(). Props eightamrock. fixes #17344 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-08-04 16:36:50 +00:00
ryan
d6d3724e78 s/login/log in/. Props johnbillion. fixes #18294 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-07-29 21:34:43 +00:00
nacin
9e9cd7160a Login is not a verb. props dcowgill, fixes #17770. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-06-12 08:00:22 +00:00
nacin
00f7846136 s/WordPress MU/WordPress/ and remove an unused sprintf param. props wpmuguru, fixes #17529. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-05-23 05:43:07 +00:00
ryan
1835dbf737 Check if empty to avoid noticed when signing up for username in multisite. Props jfarthing84, kawauso. fixes #16680 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-05-04 18:38:17 +00:00
markjaquith
c08a6a4044 restore_current_blog() in add_user_to_blog() and remove_user_from_blog() before early return, to avoid being stuck in a switched state. props mdawaffe. fixes #16444 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-02-03 00:17:30 +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
d4ce1da900 Giant chunk of phpdoc for multisite functions. props boonebgorges, SergeyBiryukov. fixes #14953. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-01-04 09:02:38 +00:00
nacin
1b18b8e5f0 s/site/user/ if signup doesn't have a domain attached. props wpmuguru, fixes #15780. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-15 17:09:26 +00:00
ryan
93908c2670 Skip confirmation email fixes. Props ocean90, duck_. see #15725 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-15 16:04:19 +00:00
ryan
3ed654c847 Go back to sanitize_user() so that dots are allowed. Props ocean90. see #14910 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-09 19:29:00 +00:00
ryan
83d1c0bf29 Use santize_key() in more places. Props WraithKenny. fixes #14910 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-08 21:32:19 +00:00
markjaquith
4fbc3224d5 Get rid of niggling hardcoded blogs.dir path. props scribu. fixes #15383 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-12-06 03:35:33 +00:00
ryan
847499e531 Pinking shears 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-17 18:47:34 +00:00
ryan
0a1fa29fe2 Return false if upload_space_check_disabled is true in upload_is_user_over_quota(). Props SergeyBiryukov. fixes #14121 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-11 16:03:51 +00:00
westi
ae213c99ca Generate Human Readable passwords as they are much more userfriendly. Fixes #13324 props Otto42. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-10 23:31:54 +00:00
nacin
a8eb3d747d Revert [16021]. See #14170. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-05 21:35:28 +00:00
westi
037fae5ae6 Don't mangle the primary_blog option when trying to fix it. Don't set people to be a subscriber on a blog they already have a role for. See #15316 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-04 09:31:58 +00:00
westi
2855be97ac When adding a user to the blog pass in the current blog id. See #15316. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-11-04 09:06:45 +00:00
scribu
4eb0f634b2 Trigger activation hooks for netork plugins when new site is created. See #14170 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-27 19:41:59 +00:00
nacin
c64766e6f2 s/ms-options/settings. props PeteMall, fixes #14826. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-21 17:09:15 +00:00
ryan
669a403b55 Update network-wide active user and blog counts via a cron job to avoid costly count queries. see #15170 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-20 20:22:14 +00:00
nacin
5e1184aa57 Pinking shears. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-19 07:48:22 +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
ec07e220ad Remove wordpressmu_wp_mail_from(). fixes #14586 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-01 18:32:47 +00:00
nacin
c63d9afdec Some phpdoc for ms-functions.php. props boonebgorges. see #14953. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-29 23:44:34 +00:00
ryan
b5008205b5 Admin bar, first pass. see #14772 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-27 20:26:36 +00:00
scribu
91ab066e89 use get_user_count() in get_sitestats() 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-15 20:13:31 +00:00
nacin
4e283a8047 Return the character range removed in [15594]. fixes #14633, props demetris. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-07 17:52:43 +00:00
nacin
d66295976c Speak in full, clear sentences. props mrmist, fixes #14633. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-09-07 15:28:56 +00:00
ryan
bb7ac14d8c Pass more info to notification filters. Props mdawaffe. fixes #14743 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-08-31 18:19:15 +00:00
markjaquith
7944bd5d82 These are not verbs. http://notaverb.com/badbad_verbs 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-27 18:02:45 +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
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
dd32
d33463f89d Fix typo in wpmu_signup_blog_notification() and wpmu_signup_user_notification(). Props mdawaffe. Fixes #14002 for trunk 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-20 04:12:03 +00:00
wpmuguru
d2517b7b02 removed unused validation from activation process, see #13760 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-10 00:10:12 +00:00
ryan
76036b069b Deprecate get_most_active_blogs() and get_blog_list(). Props ocean90. fixes #13773 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-08 13:00:09 +00:00
wpmuguru
1c6f95023b strip www before adding subdomain when creating new site 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-29 00:32:10 +00:00
wpmuguru
daba4756cc don't clobber term if sitecategories doesn't exist, fixes 13482 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 20:03:29 +00:00
nacin
4e3c7fddd0 Prevent super admins from shooting themselves in the foot. props jorbin. Checks blog names against an array (filterable) of reserved keywords for subdirectory installs. fixes #13304. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 03:13:16 +00:00
wpmuguru
b8187fcd54 allow main site 404 URL to be filtered, fixes #12758 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 23:41:36 +00:00
nacin
8aae431b3a Use a filter instead of a new NO404REDIRECT constant. see #12758. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 18:12:14 +00:00
donncha
22305da3a3 Cast "public" as an int to ensure it gets set correctly. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 16:57:32 +00:00
wpmuguru
d8fe68385d ensure unique term_id when global terms enabled, see #13482 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 07:24:10 +00:00
wpmuguru
6eb9b64e22 update rewrite rules for IIS, props Frumph, see #12758 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 05:12:47 +00:00
wpmuguru
569642dd32 give static var initial value, fixes #13517 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 00:31:07 +00:00
wpmuguru
a4e59b62eb eliminate warning in global_terms(), global to static, fixes #13517 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 00:13:03 +00:00
donncha
e2edbfc768 Added $meta to "wpmu_new_blog" action 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-24 17:26:21 +00:00
westi
2b9d0dad68 Pass extra context to wpmu_new_blog. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-06 19:36:20 +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
3a2f3b3433 s/blog/site/ in more places. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-01 07:09:38 +00:00
nacin
e64a657575 s/blog/site/ in even more places. props PeteMall, see #11644. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-30 03:17:49 +00:00
donncha
7629767c24 Display the original username on the signup form on error, fixes #13124 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-29 16:05:33 +00:00
wpmuguru
e6fbceae9f fix site administrator add user to site logic, see #12488 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-24 18:39:22 +00:00
nacin
aa8d6616a2 Single quotes are way cooler. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-24 17:49:08 +00:00
nacin
5af1e0d69d Make some branching look less crazy. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-23 19:00:30 +00:00
ryan
9f33300139 Bring back delete on empty value for update_user_option() to preserve back compat. Switch to delete_user_option() in core. Props mdawaffe. fixes #13088 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-23 14:25:05 +00:00
dd32
442d41291a Tweak new strings for better typography. Props demetris. Fixes #12962 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-11 10:41:54 +00:00
nacin
14e2cb8f6e Don't set MIME headers in MS activation/welcome emails. fixes #12728, props barry. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-10 12:11:03 +00:00
wpmuguru
7edc8acfb9 remove extraneous blog name sanitization, props nbachiyski, fixes #12823 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-05 04:00:51 +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
wpmuguru
1f7d47157d rework syncing of global terms, see #12663 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 01:26:44 +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
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
ryan
1d9fdca363 allow empty table prefix on my-sites.php, see #12459 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-02 22:55:02 +00:00
wpmuguru
d3e9b5ba92 allow empty table prefix on my-sites.php, see #12459 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-02 22:21:24 +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
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
80d9329e5e Remove unused references to global $wpdb 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-20 00:50:29 +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
ryan
731eada144 Move blogs table related functions to blogs.php. Include it before ms-settings.php so that caching API can be used instead of direct queries. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-13 22:35:11 +00:00
wpmuguru
976c058970 use object cache on get_blog_option on current blog, props sivel, See #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-13 18:56:50 +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
wpmuguru
f88db3571a add option to validate on switch_to_blog, see #12023 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-10 17:50:26 +00:00
ryan
f4ad08882e Integrate remove_tinymce_media_button() into wp_tiny_mce(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-04 20:00:18 +00:00
wpmuguru
297f3e3757 close dir in recurse_dirsize(), props ddebernardy, fixes #11749 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-04 19:56:36 +00:00
wpmuguru
603d6cb6df add siteurl filter for ms upgrades, props nacin, fixes #12069 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-04 19:26:38 +00:00
ryan
9f8149616d ms-functions pruning and cleanup. Props nacin. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-04 18:57:32 +00:00
wpmuguru
3ff2ace58a fix potential global terms inconsistency, props rboren, see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-03 01:00:57 +00:00
ryan
48aec5f822 phpdoc for global_terms(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12932 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-02 22:58:06 +00:00
ryan
1592ca9ff2 Cleanup network plugin loading. Props nacin. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-02 21:41:17 +00:00
ryan
1de8e037c8 Integrate mu_locale() into get_locale(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-29 19:03:51 +00:00
wpmuguru
cda3031b06 Improvements to queries in populate_network(), also gettext, props nacin, see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-27 19:13:00 +00:00
ryan
65ac9b6827 Integrate wordpressmu_authenticate_siteadmin() into wp_authenticate_username_password(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-27 18:11:17 +00:00
wpmuguru
ecda3f2745 deprecate validate_email(), fixes #11745 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12863 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-27 01:27:25 +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
ryan
9f1aa91f37 Integrate maybe_cancel_post_by_email() into wp-mail.php. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 20:53:59 +00:00
ryan
212533c466 Remove first page and first comment filters. They're no longer needed. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 20:42:37 +00:00
ryan
ab33443daf Integrate login_spam_check() into wp_authenticate_username_password(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 20:25:34 +00:00
ryan
9b79d3d516 Integrate wpmu_blogger_getUsersBlogs() directly into xmlrpc.php. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 20:15:43 +00:00
ryan
e6b0d64b4e Integrate fix_upload_details() into wp_upload_dir(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 20:02:11 +00:00
ryan
40570257b1 Merge mu_upload_dir() into wp_upload_dir(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 19:04:55 +00:00
ryan
2df0c3eabe Remove rss_gc(). see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 18:47:34 +00:00
ryan
5d2365a499 Remove fix_actve_plugins(). Props hakre. fixes #11750 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 18:39:12 +00:00
ryan
692cdf0c7b Move load_muplugin_textdomain() to l10n.php 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-26 17:25:31 +00:00