Commit Graph

122 Commits

Author SHA1 Message Date
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
Andrew Nacin 50194d0c51 Speak in full, clear sentences. props mrmist, fixes #14633.
git-svn-id: https://develop.svn.wordpress.org/trunk@15594 602fd350-edb4-49c9-b593-d223f7449a82
2010-09-07 15:28:56 +00:00
Ryan Boren 6267682e7f Pass more info to notification filters. Props mdawaffe. fixes #14743
git-svn-id: https://develop.svn.wordpress.org/trunk@15552 602fd350-edb4-49c9-b593-d223f7449a82
2010-08-31 18:19:15 +00:00
Mark Jaquith 59f6264c64 These are not verbs. http://notaverb.com/badbad_verbs
git-svn-id: https://develop.svn.wordpress.org/trunk@15473 602fd350-edb4-49c9-b593-d223f7449a82
2010-07-27 18:02:45 +00:00
Andrew Nacin 97366f31f0 Fix checking for whether WP_User object is actually a user. props filosofo, fixes #13903 for trunk.
git-svn-id: https://develop.svn.wordpress.org/trunk@15404 602fd350-edb4-49c9-b593-d223f7449a82
2010-07-13 21:27:05 +00:00
Ryan Boren 494ee995b5 Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@15315 602fd350-edb4-49c9-b593-d223f7449a82
2010-06-24 15:01:29 +00:00
Dion Hulse e22a4707bf Fix typo in wpmu_signup_blog_notification() and wpmu_signup_user_notification(). Props mdawaffe. Fixes #14002 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@15290 602fd350-edb4-49c9-b593-d223f7449a82
2010-06-20 04:12:03 +00:00
Ron Rennick d6d9bf32ff removed unused validation from activation process, see #13760
git-svn-id: https://develop.svn.wordpress.org/trunk@15186 602fd350-edb4-49c9-b593-d223f7449a82
2010-06-10 00:10:12 +00:00
Ryan Boren c7be6ba80f Deprecate get_most_active_blogs() and get_blog_list(). Props ocean90. fixes #13773
git-svn-id: https://develop.svn.wordpress.org/trunk@15168 602fd350-edb4-49c9-b593-d223f7449a82
2010-06-08 13:00:09 +00:00
Ron Rennick bd7ccea9ee strip www before adding subdomain when creating new site
git-svn-id: https://develop.svn.wordpress.org/trunk@15050 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-29 00:32:10 +00:00
Ron Rennick 2df4a9451a don't clobber term if sitecategories doesn't exist, fixes 13482
git-svn-id: https://develop.svn.wordpress.org/trunk@15042 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-28 20:03:29 +00:00
Andrew Nacin f26024e7b6 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: https://develop.svn.wordpress.org/trunk@14928 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-26 03:13:16 +00:00
Ron Rennick ca9f9c1086 allow main site 404 URL to be filtered, fixes #12758
git-svn-id: https://develop.svn.wordpress.org/trunk@14911 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 23:41:36 +00:00
Andrew Nacin 75e66fcb9c Use a filter instead of a new NO404REDIRECT constant. see #12758.
git-svn-id: https://develop.svn.wordpress.org/trunk@14899 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 18:12:14 +00:00
Donncha O Caoimh 7c28c554a6 Cast "public" as an int to ensure it gets set correctly.
git-svn-id: https://develop.svn.wordpress.org/trunk@14892 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 16:57:32 +00:00
Ron Rennick 7fdb99dbb5 ensure unique term_id when global terms enabled, see #13482
git-svn-id: https://develop.svn.wordpress.org/trunk@14872 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 07:24:10 +00:00
Ron Rennick aa8a5ab580 update rewrite rules for IIS, props Frumph, see #12758
git-svn-id: https://develop.svn.wordpress.org/trunk@14871 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 05:12:47 +00:00
Ron Rennick e59cbd9ac4 give static var initial value, fixes #13517
git-svn-id: https://develop.svn.wordpress.org/trunk@14867 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 00:31:07 +00:00
Ron Rennick 9aef526ca3 eliminate warning in global_terms(), global to static, fixes #13517
git-svn-id: https://develop.svn.wordpress.org/trunk@14866 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-25 00:13:03 +00:00
Donncha O Caoimh 56e498c517 Added $meta to "wpmu_new_blog" action
git-svn-id: https://develop.svn.wordpress.org/trunk@14844 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-24 17:26:21 +00:00
Peter Westwood 51aa71c394 Pass extra context to wpmu_new_blog.
git-svn-id: https://develop.svn.wordpress.org/trunk@14484 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-06 19:36:20 +00:00
Ryan Boren d783952469 Strip trailing whites.
git-svn-id: https://develop.svn.wordpress.org/trunk@14404 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-03 20:26:11 +00:00
Ryan Boren 57a5a11660 Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051
git-svn-id: https://develop.svn.wordpress.org/trunk@14374 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-03 18:16:22 +00:00
Ryan Boren 7fcda10d46 Escape links by default. Props alexkingorg. see #13051
git-svn-id: https://develop.svn.wordpress.org/trunk@14347 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-02 22:53:59 +00:00
Andrew Nacin f049bc949c s/blog/site/ in more places.
git-svn-id: https://develop.svn.wordpress.org/trunk@14326 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-01 07:09:38 +00:00
Andrew Nacin 2473cefe8f s/blog/site/ in even more places. props PeteMall, see #11644.
git-svn-id: https://develop.svn.wordpress.org/trunk@14315 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-30 03:17:49 +00:00
Donncha O Caoimh cbe8327f39 Display the original username on the signup form on error, fixes #13124
git-svn-id: https://develop.svn.wordpress.org/trunk@14298 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-29 16:05:33 +00:00