Commit Graph

173 Commits

Author SHA1 Message Date
Andrew Nacin
496ae7b83f Merge some strings. props pavelevap. fixes #22306.
git-svn-id: https://develop.svn.wordpress.org/trunk@22430 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 19:37:54 +00:00
Andrew Nacin
d34180efc2 Remove single-argument calls to wpdb:prepare(), which are invalid as nothing is being prepared. see #22262.
git-svn-id: https://develop.svn.wordpress.org/trunk@22428 602fd350-edb4-49c9-b593-d223f7449a82
2012-11-07 19:28:08 +00:00
Ryan Boren
fd8eeb4b8a Consolidate some transalted strings. Remove unnecessary trailing newlines. Props pavelevap. fixes #22274
git-svn-id: https://develop.svn.wordpress.org/trunk@22308 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-25 22:21:15 +00:00
Peter Westwood
44682216a8 i18n: Fix the usage of sprintf replacements in the Multisite include files. See #22260.
git-svn-id: https://develop.svn.wordpress.org/trunk@22270 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-23 11:27:20 +00:00
Ryan Boren
8d5ca186c2 Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728
git-svn-id: https://develop.svn.wordpress.org/trunk@22124 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-05 19:04:34 +00:00
Andrew Nacin
e5c363a8ff Use 2 * DAY_IN_SECONDS rather than 172800. props pavelevap. fixes #20987.
git-svn-id: https://develop.svn.wordpress.org/trunk@22121 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-05 13:11:16 +00:00
Ryan Boren
42cfdfb614 * 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: https://develop.svn.wordpress.org/trunk@22092 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-01 18:03:23 +00:00
Ryan Boren
1ee0534f98 Add domain_exists filter. Props jamescollins. fixes #21142
git-svn-id: https://develop.svn.wordpress.org/trunk@22065 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-27 17:30:34 +00:00
Andrew Nacin
774a12be83 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: https://develop.svn.wordpress.org/trunk@21996 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-25 05:26:19 +00:00
Ryan Boren
097c2c0e90 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: https://develop.svn.wordpress.org/trunk@21924 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-20 13:39:46 +00:00
Andrew Nacin
9da4708e6d 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: https://develop.svn.wordpress.org/trunk@21860 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-15 20:05:58 +00:00
Andrew Nacin
0b2a08728b Pass current network ID to domain_exists() in wpmu_validate_blog_signup(). props larysa, fixes #17303.
git-svn-id: https://develop.svn.wordpress.org/trunk@21853 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-15 19:29:59 +00:00
Andrew Nacin
7f29924c6a Remove ms-files.php rewriting from WordPress multisite. fixes #19235.
Keep existing networks compatible with a ms_files_rewriting network option.



git-svn-id: https://develop.svn.wordpress.org/trunk@21823 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 22:22:20 +00:00
Ryan Boren
92ea34f6a2 Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759
git-svn-id: https://develop.svn.wordpress.org/trunk@21664 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-30 13:33:00 +00:00
Ryan Boren
a94b94504a 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: https://develop.svn.wordpress.org/trunk@21628 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-27 16:22:45 +00:00
Andrew Nacin
a5c7405975 Move most instances of new WP_User to get_userdata(). see #21120.
git-svn-id: https://develop.svn.wordpress.org/trunk@21413 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 01:06:05 +00:00
Peter Westwood
61abf077d0 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: https://develop.svn.wordpress.org/trunk@21387 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 13:52:06 +00:00
Mark Jaquith
0290c34cee 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: https://develop.svn.wordpress.org/trunk@21237 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-09 03:49:23 +00:00
Andrew Nacin
309ae4c917 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: https://develop.svn.wordpress.org/trunk@21172 602fd350-edb4-49c9-b593-d223f7449a82
2012-06-28 20:38:16 +00:00
Ryan Boren
1f3ca85ab5 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: https://develop.svn.wordpress.org/trunk@20697 602fd350-edb4-49c9-b593-d223f7449a82
2012-05-02 20:31:37 +00:00
Andrew Nacin
07fce717e7 Use maybe_serialize() where appropriate. fixes #19617.
git-svn-id: https://develop.svn.wordpress.org/trunk@20612 602fd350-edb4-49c9-b593-d223f7449a82
2012-04-27 15:57:51 +00:00
Ryan Boren
beb1d196b3 Add terminal punctuation to some signup error messages. Props dllh. fixes #20332
git-svn-id: https://develop.svn.wordpress.org/trunk@20441 602fd350-edb4-49c9-b593-d223f7449a82
2012-04-11 20:41:59 +00:00
Ryan Boren
6f9ceb2326 Introduce WP_User::exists(). see #20372
git-svn-id: https://develop.svn.wordpress.org/trunk@20378 602fd350-edb4-49c9-b593-d223f7449a82
2012-04-06 19:18:45 +00:00
Andrew Nacin
54a6a40533 Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948.
git-svn-id: https://develop.svn.wordpress.org/trunk@20287 602fd350-edb4-49c9-b593-d223f7449a82
2012-03-24 15:24:31 +00:00
Andrew Nacin
df490f0ec5 Pass WP_User object to the newuser_notify_siteadmin filter. props boonebgorges. fixes #20162.
git-svn-id: https://develop.svn.wordpress.org/trunk@20101 602fd350-edb4-49c9-b593-d223f7449a82
2012-03-02 23:52:19 +00:00
Andrew Nacin
7391c909df Simplify matching code. see #19670.
git-svn-id: https://develop.svn.wordpress.org/trunk@19852 602fd350-edb4-49c9-b593-d223f7449a82
2012-02-07 17:44:29 +00:00
Ryan Boren
b495757102 Fix notices. Simplify checkbox logic. Props SergeyBiryukov. fixes #19670
git-svn-id: https://develop.svn.wordpress.org/trunk@19850 602fd350-edb4-49c9-b593-d223f7449a82
2012-02-07 17:12:46 +00:00
Jon Cave
c67d273f1f Remove redundant logic from filter_SSL(). Props deltafactory. Fixes #19899.
git-svn-id: https://develop.svn.wordpress.org/trunk@19759 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-26 09:21:44 +00:00
Andrew Nacin
c647c3494d Use get_blog_prefix() in another MU function. see #19891.
git-svn-id: https://develop.svn.wordpress.org/trunk@19749 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-25 00:10:46 +00:00
Andrew Nacin
844dd38b8f Use get_blog_prefix() in get_most_recent_post_of_user(). see #19891.
git-svn-id: https://develop.svn.wordpress.org/trunk@19748 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-25 00:09:30 +00:00
Andrew Nacin
c8b1c822ce Remove copy-pasted comment from upload_is_user_over_quota()'s phpdoc. It came from recurse_dirsize(). see #19879.
git-svn-id: https://develop.svn.wordpress.org/trunk@19747 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-24 23:54:24 +00:00
Ryan Boren
2b186b0c45 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: https://develop.svn.wordpress.org/trunk@19712 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-08 17:01:11 +00:00
Jon Cave
2cc75b6a05 Fix some mismatching parameter documentation. Props akshayagarwal, linuxologos. See #19756.
git-svn-id: https://develop.svn.wordpress.org/trunk@19695 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-06 11:42:00 +00:00
Ryan Boren
f6b0e7e580 Use home_url() instead of site_url(). Props johnbillion. fixes #18293
git-svn-id: https://develop.svn.wordpress.org/trunk@19674 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-04 19:29:03 +00:00
Ryan Boren
676ba7043e Use one space, not two, after trailing punctuation. fixes #19537
git-svn-id: https://develop.svn.wordpress.org/trunk@19593 602fd350-edb4-49c9-b593-d223f7449a82
2011-12-13 23:45:31 +00:00
Andrew Nacin
69a34ae62d They call me multisite. props ryan, zeo. see #19020.
git-svn-id: https://develop.svn.wordpress.org/trunk@19504 602fd350-edb4-49c9-b593-d223f7449a82
2011-12-01 00:36:19 +00:00
Andrew Nacin
2ae685c4c2 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: https://develop.svn.wordpress.org/trunk@19182 602fd350-edb4-49c9-b593-d223f7449a82
2011-11-05 20:23:55 +00:00
Ryan Boren
2c83b5728f 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: https://develop.svn.wordpress.org/trunk@19016 602fd350-edb4-49c9-b593-d223f7449a82
2011-10-19 22:35:15 +00:00
Ryan Boren
319d070078 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: https://develop.svn.wordpress.org/trunk@18899 602fd350-edb4-49c9-b593-d223f7449a82
2011-10-06 00:21:24 +00:00
Mark Jaquith
a3bdf19206 Be more consistent with ERROR: messages. fixes #15887
git-svn-id: https://develop.svn.wordpress.org/trunk@18841 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-30 17:18:35 +00:00
Ryan Boren
805762af8f Deprecate wpmu_admin_redirect_add_updated_param() and wpmu_admin_do_redirect(). Props SergeyBiryukov. fixes #18619
git-svn-id: https://develop.svn.wordpress.org/trunk@18834 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-30 15:13:13 +00:00
Andrew Nacin
8439f8cd5c Ensure we have a full blog object in get_active_blog_for_user(). fixes #18789.
git-svn-id: https://develop.svn.wordpress.org/trunk@18791 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-27 07:36:36 +00:00
Jon Cave
45c26903bf Fix copy+paste error in documentation. Props masonjames, SergeyBiryukov. Fixes #18545.
git-svn-id: https://develop.svn.wordpress.org/trunk@18768 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-24 19:37:34 +00:00
Andrew Nacin
78b5130751 Use untrailingslashit in url_shorten() and recurse_dirsize(). Remove unnecessary camelCase variables. see #18592.
git-svn-id: https://develop.svn.wordpress.org/trunk@18637 602fd350-edb4-49c9-b593-d223f7449a82
2011-09-05 16:53:19 +00:00
Andrew Nacin
87ec764c57 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: https://develop.svn.wordpress.org/trunk@18560 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-17 17:49:57 +00:00
Andrew Nacin
666b55d3c0 Use preg_match more efficiently. props solarissmoke, fixes #17287.
git-svn-id: https://develop.svn.wordpress.org/trunk@18524 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-10 19:18:18 +00:00
Ryan Boren
19b936f2a8 Return true upon success in remove_user_from_blog(). Props eightamrock. fixes #17344
git-svn-id: https://develop.svn.wordpress.org/trunk@18510 602fd350-edb4-49c9-b593-d223f7449a82
2011-08-04 16:36:50 +00:00
Ryan Boren
668849b388 s/login/log in/. Props johnbillion. fixes #18294
git-svn-id: https://develop.svn.wordpress.org/trunk@18486 602fd350-edb4-49c9-b593-d223f7449a82
2011-07-29 21:34:43 +00:00
Andrew Nacin
a3e602baec Login is not a verb. props dcowgill, fixes #17770.
git-svn-id: https://develop.svn.wordpress.org/trunk@18289 602fd350-edb4-49c9-b593-d223f7449a82
2011-06-12 08:00:22 +00:00
Andrew Nacin
d996e79999 s/WordPress MU/WordPress/ and remove an unused sprintf param. props wpmuguru, fixes #17529.
git-svn-id: https://develop.svn.wordpress.org/trunk@18003 602fd350-edb4-49c9-b593-d223f7449a82
2011-05-23 05:43:07 +00:00