Commit Graph

115 Commits

Author SHA1 Message Date
Scott Taylor c96d7fff01 In `get_network_by_path()`, `$exact_domains` is unused.
See #27882.

Built from https://develop.svn.wordpress.org/trunk@28329


git-svn-id: http://core.svn.wordpress.org/trunk@28157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-06 21:32:16 +00:00
Sergey Biryukov d711c32138 Update deleted site message in ms_site_check().
props boonebgorges.
fixes #28150.
Built from https://develop.svn.wordpress.org/trunk@28321


git-svn-id: http://core.svn.wordpress.org/trunk@28149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-06 18:46:15 +00:00
Andrew Nacin e239dfad43 Multisite: Treat 'www' as a special subdomain, reversing 3.9 regression.
props jeremyfelt.
fixes #27927.

Built from https://develop.svn.wordpress.org/trunk@28280


git-svn-id: http://core.svn.wordpress.org/trunk@28108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-06 05:32:36 +00:00
Andrew Nacin 827b92a9bd Formally deprecate wpmu_current_site().
props jeremyfelt.
fixes #27702.

Built from https://develop.svn.wordpress.org/trunk@28009


git-svn-id: http://core.svn.wordpress.org/trunk@27839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-07 21:28:16 +00:00
Drew Jaynes a4f4744a3b Inline documentation improvements in wp-includes/ms-load.php for 3.9 functionality.
Clarifies some mixed type parameters, spacing and comment style, and language fixes.

See #27700.

Built from https://develop.svn.wordpress.org/trunk@28006


git-svn-id: http://core.svn.wordpress.org/trunk@27836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-07 20:59:15 +00:00
Andrew Nacin 4fb0aa5ecb In get_site_by_path(), avoid passing $paths through prepare(). If a path contains a %, we end up with problems. see #27003.
Built from https://develop.svn.wordpress.org/trunk@27439


git-svn-id: http://core.svn.wordpress.org/trunk@27286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 18:18:15 +00:00
Andrew Nacin 0e9ef2491c Deprecate get_current_site_name(). see #27003.
Built from https://develop.svn.wordpress.org/trunk@27407


git-svn-id: http://core.svn.wordpress.org/trunk@27254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-05 06:39:21 +00:00
Andrew Nacin 0523624d31 Doc fixes for wp_get_network().
props TobiasBg.
see #27003.

Built from https://develop.svn.wordpress.org/trunk@27381


git-svn-id: http://core.svn.wordpress.org/trunk@27230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 18:56:14 +00:00
Andrew Nacin ffc4ca7b01 Introduce get_site_by_path() and further rewrite the site detection process for multisite.
This is the first big step to supporting arbitrary domains and paths. In this new approach, sites are detected first where possible, then the network is inferred. Allows filtering for arbitrary path segments, smooths out some weirdness, and removes various restrictions. A sunrise plugin could do much of its work by adding filters, if those are even needed.

see #27003.

Built from https://develop.svn.wordpress.org/trunk@27359


git-svn-id: http://core.svn.wordpress.org/trunk@27209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-02 22:25:14 +00:00
Mark Jaquith 79fbaf2e4c Fix a sometimes notice in wpmu_current_site()
props johnjamesjacoby. see #27003.
Built from https://develop.svn.wordpress.org/trunk@27275


git-svn-id: http://core.svn.wordpress.org/trunk@27131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 20:53:13 +00:00
Andrew Nacin eae1d5641d Multisite: Add get_network_by_path() and wp_get_network() to begin cleanup of multisite load.
Tries to get network detection under control by simplifying wpmu_current_site(). It now also pops off each subdomain to find a more general match. Adds unit tests for get_network_by_path() and a new network factory for unit tests.

Much of this is likely to change in 3.9 as more of ms-load.php and ms-settings.php gets hacked to bits.

props jeremyfelt.
see #27003.

Built from https://develop.svn.wordpress.org/trunk@27178


git-svn-id: http://core.svn.wordpress.org/trunk@27040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-13 23:07:14 +00:00
Andrew Nacin fb3985663a Remove an unnecessary variable passed to wpdb::prepare() during multisite load.
props jeremyfelt.
fixes #26941.

Built from https://develop.svn.wordpress.org/trunk@27076


git-svn-id: http://core.svn.wordpress.org/trunk@26949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-02 22:09:12 +00:00
Sergey Biryukov 74f77b85a6 Use get_current_site() instead of the $current_site global when possible.
props jeremyfelt.
fixes #25158.
Built from https://develop.svn.wordpress.org/trunk@26120


git-svn-id: http://core.svn.wordpress.org/trunk@26032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 03:23:10 +00:00
Andrew Nacin d0cfa40983 Add jshintrc to qunit.
props jorbin.
see #25187.

Built from https://develop.svn.wordpress.org/trunk@25992


git-svn-id: http://core.svn.wordpress.org/trunk@25925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-30 14:39:10 +00:00
Andrew Nacin 70fd806759 Revert r25824:25875 from the core.svn.wordpress.org repository.
These commits were accidentally re-synced commits from develop.svn.wordpress.org due to a race condition. Thankfully, the history of this repository matters fairly little. It also happened only for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@25876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-25 02:29:52 +00:00
Andrew Nacin 8ae8e01b67 Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone.
see #27704.

Built from https://develop.svn.wordpress.org/trunk@25825


git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:53:14 +00:00
Ryan Boren b87d4b77e5 Pinking shears
Built from https://develop.svn.wordpress.org/trunk@25880


git-svn-id: http://core.svn.wordpress.org/trunk@25792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-23 14:38:10 +00:00
Drew Jaynes bc7ea63093 Inline documentation for hooks in wp-includes/ms-load.php.
Props nukaga, johnbillion.
Fixes #25509.

Built from https://develop.svn.wordpress.org/trunk@25732


git-svn-id: http://core.svn.wordpress.org/trunk@25645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-08 20:01:09 +00:00
Andrew Nacin 3ddb3c0abb Remove some old debug cruft left by yours truly. fixes #24462.
git-svn-id: http://core.svn.wordpress.org/trunk@24518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-06-26 19:33:58 +00:00
Andrew Nacin a518fb0c94 Fix usage of undeclared variables.
* the_weekday_date() needs the global $currentday
 * ms_site_check() needs the global $current_site
 * media list table does not need to check for $total_orphans
 * upgrader has no $feedback variable, appears to be copypasta from other upgrade APIs
 * install_themes_feature_list() has no $features variable, return array() instead of a new return type of WP_Error

see #24210.



git-svn-id: http://core.svn.wordpress.org/trunk@24189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-07 16:35:03 +00:00
Andrew Nacin 837fadc3dc Merge two strings. props pavelevap, see #22306.
git-svn-id: http://core.svn.wordpress.org/trunk@22449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 22:03:23 +00:00
Ryan Boren 7a86de87fb Reduce use of global. Use get_blog_details() instead. fixes #22090
git-svn-id: http://core.svn.wordpress.org/trunk@22108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-04 12:40:09 +00:00
nacin 81ed9a7563 Introduce wp_load_translations_early(), which can be used before the locale is properly loaded in order to translate early error strings. Internationalize setup-config.php -- translators no longer have a reason to modify this file. fixes #18180.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-26 20:34:27 +00:00
ryan e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
dd32 d8494f4a54 Close WP_I18N_WHAT_DO_I_DO translation tag properly. Props Nao. Fixes #19328
git-svn-id: http://svn.automattic.com/wordpress/trunk@19395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-22 10:22:45 +00:00
ryan 28b1b4763d Avoid E_STRICT notices. see #18975
git-svn-id: http://svn.automattic.com/wordpress/trunk@19094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-31 19:38:46 +00:00
ryan 14da950982 Don't set the site_name cache on every call to get_current_site_name(). Props mark-k, solarissmoke. fixes #16676
git-svn-id: http://svn.automattic.com/wordpress/trunk@18604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-25 19:29:47 +00:00
PeteMall 800443d208 Ensure correct HTTP status code is returned. Props nacin, fixes #15799
git-svn-id: http://svn.automattic.com/wordpress/trunk@16906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-14 08:38:01 +00:00
nacin 440671b932 Initialize this variable.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16785 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-08 01:03:12 +00:00
ryan 86c173262f Load network plugins for wp-activate.php. Restore MU load order. Props blamenacin. fixes #14718
git-svn-id: http://svn.automattic.com/wordpress/trunk@16558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-24 00:19:38 +00:00
ryan db718fc987 Cache to site_name instead of current_site_name. Props benward. fixes #14461
git-svn-id: http://svn.automattic.com/wordpress/trunk@15551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-31 18:17:20 +00:00
nacin e91e34be6a Remove a @todo. see #14014.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-25 16:25:29 +00:00
nacin b3c30fe1ff WPMU->Network Codex link updates. props wpmuguru, see #14014 for trunk.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-25 16:15:43 +00:00
nacin 1852eae49f Deprecate VHOST in favor of a boolean, SUBDOMAIN_INSTALL. Core will keep VHOST defined for plugins' sake, but you should only define SUBDOMAIN_INSTALL. Throws a notice if VHOST is defined, and a warning if they somehow conflict. Sunrise can still handle them. fixes #11796.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-04 20:48:28 +00:00
nacin 9d077332ba Fix string in ms_not_installed().
git-svn-id: http://svn.automattic.com/wordpress/trunk@14367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 10:14:15 +00:00
nacin 223277cc44 Fix notice in ms_not_installed().
git-svn-id: http://svn.automattic.com/wordpress/trunk@14364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 09:51:40 +00:00
nacin d08414276a Prune and tidy the message in ms_not_installed. Only show detailed information if wp-admin, likesingle installs. Use ->tables. @todo: non-'MU' codex link.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 15:21:10 +00:00
nacin f9df8a36ae s/blog/site/ in more places. props PeteMall, see #11644.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 01:54:32 +00:00
ryan dd5fb17b87 Return true. fixes #13094
git-svn-id: http://svn.automattic.com/wordpress/trunk@14199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-23 16:50:01 +00:00
ryan ff140f1d76 Move ms_site_check() to after init and allow super admins to view blocked sites. see #13094
git-svn-id: http://svn.automattic.com/wordpress/trunk@14198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-23 16:18:33 +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 a7feaed0e6 Change @since 3.0 to @since 3.0.0.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-26 19:13:36 +00:00
nbachiyski 70b7755535 Wrap transtable strings used in Network install in WP_I18N_SOMETHING, because translations still aren't loaded. Fixes #12357
git-svn-id: http://svn.automattic.com/wordpress/trunk@13797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-22 06:51:49 +00:00
nacin 5be468ea5f Allow localhost in a multisite subdirectory install. More network.php improvements. see #12457 for localhost. see #11816
git-svn-id: http://svn.automattic.com/wordpress/trunk@13622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-09 06:14:42 +00:00
nacin a2aad1bb00 More network.php refinements. Bring wp-config and htaccess inline. Rename BLOGID_CURRENT_SITE to BLOG_ID_CURRENT_SITE for consistency with SITE_ID_CURRENT_SITE. see #11816
git-svn-id: http://svn.automattic.com/wordpress/trunk@13611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-06 20:01:32 +00:00
wpmuguru 097b18b559 remove __( calls from ms startup, see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-03 17:13:38 +00:00
wpmuguru 4378b20de3 Warnings, code & UI/UX cleanup, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 23:12:51 +00:00
nacin 4451f3f64f Minor MS startup cleanups. See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-20 14:07:23 +00:00
nacin 20f50e7f06 Rename is_installed() to ms_not_installed(). See #12083
git-svn-id: http://svn.automattic.com/wordpress/trunk@13253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-20 13:51:32 +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 f97aa91a68 Preload commonly loaded site options when running multisite without a persistent cache. Introduce wp_cache_reset() and call it instead of wp_cache_init() when re-initing after the blog ID chanages to avoid throwing out the entire cache. Pass cached site options through the site option filter when fetching.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-12 17:06:43 +00:00
ryan c9d92fc859 Trim trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@13025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-08 18:02:23 +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
wpmuguru b01479de37 reorganize code on ms startup. props nacin, see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12921 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-01 20:26:08 +00:00
ryan 19c9d0bb79 Remove db error show/hide, suppress/unsuppress in ms bootstrap. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-29 19:16:07 +00:00
wpmuguru 493a307cf7 rearrage multisite initialization, remove deprecated $wpmuBaseTablePrefix, props nacin, see #11881
git-svn-id: http://svn.automattic.com/wordpress/trunk@12885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-28 16:09:52 +00:00
wpmuguru 77c73fa456 Change VHOST check to is_subdomain_install(), See #11796
git-svn-id: http://svn.automattic.com/wordpress/trunk@12836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-26 15:20:49 +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
wpmuguru 2f3f5b351f allow www installs to enable multisite, see #11945
git-svn-id: http://svn.automattic.com/wordpress/trunk@12787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-21 17:20:23 +00:00
dd32 6ad023b5e0 White space clean-up. See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 07:44:47 +00:00
dd32 da10910302 Typo fix in Network Plugins. Props nacin. See #11881
git-svn-id: http://svn.automattic.com/wordpress/trunk@12772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 07:37:53 +00:00
wpmuguru 515d1354da sync single and multisite cookie hash, remove extraneous code, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 01:14:05 +00:00
ryan 506c22bfd5 phpdoc for load.php, return some includes to global scope. Props nacin. see #11881
git-svn-id: http://svn.automattic.com/wordpress/trunk@12762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-19 17:27:03 +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
wpmuguru dbd245932d multi-site startup, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-10 18:10:51 +00:00