Commit Graph

238 Commits

Author SHA1 Message Date
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
ryan
8d48c939fa Deprecate get_user_details(). see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-26 17:16:49 +00:00
ryan
844056354b Deprecate get_current_user_id(). see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-26 17:12:38 +00:00
ryan
9fc2bef3d1 Move blog deletion to ms-delete-site.php. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-25 22:46:41 +00:00
ryan
b090a0336f Deprecate graceful_fail(). see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-25 22:09:43 +00:00
ryan
63f9a62af6 phpdoc and cleanup. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-25 22:01:43 +00:00
wpmuguru
2caa9c7e40 Change get_blogs_of_user to include 3.0 main site, Fixes #11975
git-svn-id: http://svn.automattic.com/wordpress/trunk@12807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-22 23:51:23 +00:00
ryan
3609f388f5 Introduce update_blog_details(). Add some phpdoc. Fix some warnings. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-22 23:35:59 +00:00
ryan
96b459d0b4 Fix warnings
git-svn-id: http://svn.automattic.com/wordpress/trunk@12800 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-22 22:14:22 +00:00
ryan
92bf8d124c Introduce WP_User::for_blog() and current_user_can_for_blog() to avoid calls to WP_User::_init_caps(). fixes #11781
git-svn-id: http://svn.automattic.com/wordpress/trunk@12796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-22 17:27:28 +00:00
ryan
c679e65c9c Add email and login dupe checking down into wp_insert_user(). Tidy up user-new.php. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 21:58:13 +00:00
ryan
af9c401d97 Deprecate wp_install_blog_defaults(). Use wp_install_defaults() instead. fixes #11747 see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 20:09:41 +00:00
ryan
42d8102a9c Merge clear_global_post_cache() into clean_post_cache(). fixes #11744
git-svn-id: http://svn.automattic.com/wordpress/trunk@12768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-19 19:45:44 +00:00
ryan
a06a4c6b70 Formatting cleanups
git-svn-id: http://svn.automattic.com/wordpress/trunk@12760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-19 17:01:39 +00:00
ryan
6da55f7792 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@12733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-15 22:11:12 +00:00
wpmuguru
432087e89e fix multisite object cache warnings, $table_prefix assignment, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-15 18:02:34 +00:00
ryan
f4c3545fba Formatting cleanup. Props Simek. fixes #11876
git-svn-id: http://svn.automattic.com/wordpress/trunk@12709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-12 18:40:40 +00:00
wpmuguru
4b8c87da92 Add is_subdomain_install() to ms code - Fixes #11796
git-svn-id: http://svn.automattic.com/wordpress/trunk@12674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-08 21:25:01 +00:00
ryan
166435891c Convert update_themes, update_plugins, update_core, and dismissed_update_core into site transients/plugins. Remove no longer need compat code.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-08 20:49:55 +00:00
ryan
dea7019303 Use is_super_admin() instead of is_site_admin(). Props GIGALinux see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-08 20:29:56 +00:00
ryan
53324a6983 Deprecate is_site_admin. Props nacin. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 15:50:46 +00:00
azaozz
40efc5b7f4 Check if VHOST is defined in get_id_from_blogname()
git-svn-id: http://svn.automattic.com/wordpress/trunk@12643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 10:52:21 +00:00
ryan
adf017f6b9 Strip trailing whites from ms files. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 04:27:46 +00:00
ryan
49cda5fdb6 Remove raquo. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 03:40:03 +00:00
ryan
ce33a91f95 Deprecate generate_random_password(). fixes #11746
git-svn-id: http://svn.automattic.com/wordpress/trunk@12624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 02:22:51 +00:00
ryan
eea7c0ee49 Better POST_BY_EMAIL logic. Props Denis-de-Bernardy. fixes #11752
git-svn-id: http://svn.automattic.com/wordpress/trunk@12623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 01:29:40 +00:00
ryan
fd475d2b38 s/wpmu/ms/ in file refs. Props Denis-de-Bernardy. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 00:30:53 +00:00
ryan
5ba4a05d29 Introduce is_super_admin(). see #11644.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-06 23:27:22 +00:00
westi
53d810f260 Remove svn:executable property on new files. Fixes #11743 props Denis-de-Bernardy.
git-svn-id: http://svn.automattic.com/wordpress/trunk@12610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-06 22:22:45 +00:00
wpmuguru
d07d6c5717 Add mu only (inactive) files
git-svn-id: http://svn.automattic.com/wordpress/trunk@12603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-06 04:02:57 +00:00