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 |