Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 10:22:23 +01:00
Code Issues Projects Releases Wiki Activity
13,494 Commits 50 Branches 747 Tags 789 MiB
262545acd5
Commit Graph

87 Commits

Author SHA1 Message Date
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