Commit Graph

148 Commits

Author SHA1 Message Date
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
Ryan Boren
f0a83251ec Check if empty to avoid noticed when signing up for username in multisite. Props jfarthing84, kawauso. fixes #16680
git-svn-id: https://develop.svn.wordpress.org/trunk@17794 602fd350-edb4-49c9-b593-d223f7449a82
2011-05-04 18:38:17 +00:00
Mark Jaquith
5b5b5e7747 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: https://develop.svn.wordpress.org/trunk@17379 602fd350-edb4-49c9-b593-d223f7449a82
2011-02-03 00:17:30 +00:00
Ryan Boren
eba71eb7c0 Bring out the shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@17228 602fd350-edb4-49c9-b593-d223f7449a82
2011-01-06 04:11:14 +00:00
Andrew Nacin
249fb0bbad Giant chunk of phpdoc for multisite functions. props boonebgorges, SergeyBiryukov. fixes #14953.
git-svn-id: https://develop.svn.wordpress.org/trunk@17218 602fd350-edb4-49c9-b593-d223f7449a82
2011-01-04 09:02:38 +00:00
Andrew Nacin
2a44684f3e s/site/user/ if signup doesn't have a domain attached. props wpmuguru, fixes #15780.
git-svn-id: https://develop.svn.wordpress.org/trunk@16954 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-15 17:09:26 +00:00
Ryan Boren
b04abefc26 Skip confirmation email fixes. Props ocean90, duck_. see #15725
git-svn-id: https://develop.svn.wordpress.org/trunk@16949 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-15 16:04:19 +00:00
Ryan Boren
a239d692a7 Go back to sanitize_user() so that dots are allowed. Props ocean90. see #14910
git-svn-id: https://develop.svn.wordpress.org/trunk@16848 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-09 19:29:00 +00:00
Ryan Boren
00356f8e4a Use santize_key() in more places. Props WraithKenny. fixes #14910
git-svn-id: https://develop.svn.wordpress.org/trunk@16822 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-08 21:32:19 +00:00
Mark Jaquith
846861441b Get rid of niggling hardcoded blogs.dir path. props scribu. fixes #15383
git-svn-id: https://develop.svn.wordpress.org/trunk@16738 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-06 03:35:33 +00:00
Ryan Boren
4b33a0e9c4 Pinking shears
git-svn-id: https://develop.svn.wordpress.org/trunk@16438 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-17 18:47:34 +00:00
Ryan Boren
d0f30f75e5 Return false if upload_space_check_disabled is true in upload_is_user_over_quota(). Props SergeyBiryukov. fixes #14121
git-svn-id: https://develop.svn.wordpress.org/trunk@16299 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-11 16:03:51 +00:00
Peter Westwood
ea7bd69745 Generate Human Readable passwords as they are much more userfriendly. Fixes #13324 props Otto42.
git-svn-id: https://develop.svn.wordpress.org/trunk@16284 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-10 23:31:54 +00:00
Andrew Nacin
6a8c5b337b Revert [16021]. See #14170.
git-svn-id: https://develop.svn.wordpress.org/trunk@16213 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-05 21:35:28 +00:00
Peter Westwood
75dc7c8c37 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: https://develop.svn.wordpress.org/trunk@16179 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-04 09:31:58 +00:00
Peter Westwood
3c5457259b When adding a user to the blog pass in the current blog id. See #15316.
git-svn-id: https://develop.svn.wordpress.org/trunk@16178 602fd350-edb4-49c9-b593-d223f7449a82
2010-11-04 09:06:45 +00:00
scribu
9c918c6a05 Trigger activation hooks for netork plugins when new site is created. See #14170
git-svn-id: https://develop.svn.wordpress.org/trunk@16021 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-27 19:41:59 +00:00
Andrew Nacin
6a5a1b338b s/ms-options/settings. props PeteMall, fixes #14826.
git-svn-id: https://develop.svn.wordpress.org/trunk@15899 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-21 17:09:15 +00:00
Ryan Boren
4c3535a58d Update network-wide active user and blog counts via a cron job to avoid costly count queries. see #15170
git-svn-id: https://develop.svn.wordpress.org/trunk@15875 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-20 20:22:14 +00:00
Andrew Nacin
fb4e38b0e7 Pinking shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@15843 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-19 07:48:22 +00:00
Ryan Boren
9ee8b20f30 First pass of user admin. Network admin and screen cleanups. see #14696
git-svn-id: https://develop.svn.wordpress.org/trunk@15746 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-07 19:34:18 +00:00
Ryan Boren
4c2c9bc17d Remove wordpressmu_wp_mail_from(). fixes #14586
git-svn-id: https://develop.svn.wordpress.org/trunk@15678 602fd350-edb4-49c9-b593-d223f7449a82
2010-10-01 18:32:47 +00:00
Andrew Nacin
c5de43dced Some phpdoc for ms-functions.php. props boonebgorges. see #14953.
git-svn-id: https://develop.svn.wordpress.org/trunk@15675 602fd350-edb4-49c9-b593-d223f7449a82
2010-09-29 23:44:34 +00:00
Ryan Boren
733af07765 Admin bar, first pass. see #14772
git-svn-id: https://develop.svn.wordpress.org/trunk@15671 602fd350-edb4-49c9-b593-d223f7449a82
2010-09-27 20:26:36 +00:00
scribu
98d1045606 use get_user_count() in get_sitestats()
git-svn-id: https://develop.svn.wordpress.org/trunk@15621 602fd350-edb4-49c9-b593-d223f7449a82
2010-09-15 20:13:31 +00:00
Andrew Nacin
7845df0f09 Return the character range removed in [15594]. fixes #14633, props demetris.
git-svn-id: https://develop.svn.wordpress.org/trunk@15595 602fd350-edb4-49c9-b593-d223f7449a82
2010-09-07 17:52:43 +00:00