Commit Graph

48 Commits

Author SHA1 Message Date
Andrew Nacin 7e6f346bdd Translate some hard-coded strings. props PeteMall.
git-svn-id: https://develop.svn.wordpress.org/trunk@14719 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-18 04:41:08 +00:00
Andrew Nacin 83081d3feb Validation for network.php. props dremeda, see #13383.
git-svn-id: https://develop.svn.wordpress.org/trunk@14659 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-15 06:49:16 +00:00
Andrew Nacin 4861bebf05 Add a form action to network.php. props xibe, see #13383.
git-svn-id: https://develop.svn.wordpress.org/trunk@14657 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-15 06:19:27 +00:00
Andrew Nacin 06fc3ff50f Close wrapper div when ending network_step1 with a warning. props Caspie, fixes #13389.
git-svn-id: https://develop.svn.wordpress.org/trunk@14630 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-14 12:34:48 +00:00
Ron Rennick 0d826fa206 add subdomain explanation to network install, see #12931
git-svn-id: https://develop.svn.wordpress.org/trunk@14514 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-08 15:43:00 +00:00
Ron Rennick 9c8a73aa37 add network install rule, filter & UI tweaks, see #12931
git-svn-id: https://develop.svn.wordpress.org/trunk@14513 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-08 15:25:33 +00:00
Andrew Nacin 71c9ad21de Link to active plugins when we block a Network upgrade due to them. props ocean90.
git-svn-id: https://develop.svn.wordpress.org/trunk@14463 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-05 18:43:54 +00:00
Andrew Nacin 42e9ce36fc 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: https://develop.svn.wordpress.org/trunk@14452 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-04 20:48:28 +00:00
Ron Rennick 997a121259 allow subdir multisite on ip address, see #12142
git-svn-id: https://develop.svn.wordpress.org/trunk@14386 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-03 19:23:37 +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
Dion Hulse 491063c698 Tweak new strings for better typography. Props demetris. Fixes #12962
git-svn-id: https://develop.svn.wordpress.org/trunk@14070 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-11 10:41:54 +00:00
Andrew Nacin 2fc834c550 More verbose message on how to add MS constants to one's config file. props sivel, see #12848
git-svn-id: https://develop.svn.wordpress.org/trunk@13999 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-04 23:49:11 +00:00
Ron Rennick 52c9389af1 fix folder install detection in [13926], see #12736
git-svn-id: https://develop.svn.wordpress.org/trunk@13930 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-02 03:27:08 +00:00
Andrew Nacin 96144d31d9 Switch from wp_die() to a nice error message for siteurl!=home for network.php. see #12736
git-svn-id: https://develop.svn.wordpress.org/trunk@13929 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-02 03:24:18 +00:00
Ron Rennick fc051c063f block subdomain install when install is in a folder, see #12736
git-svn-id: https://develop.svn.wordpress.org/trunk@13926 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-02 02:04:25 +00:00
Ron Rennick ca9b460f34 block enabling network when siteurl and home are not the same, see #12736
git-svn-id: https://develop.svn.wordpress.org/trunk@13904 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-31 18:23:05 +00:00
Andrew Nacin 3d67dd8d50 Use actual hostname instead of example.com in subdirectory/subdomain examples. fixes #12679, props johnbillion.
git-svn-id: https://develop.svn.wordpress.org/trunk@13811 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-25 02:49:23 +00:00
Andrew Nacin 1559240917 Some improvements to the network.php mod_rewrite checks. see #12255
git-svn-id: https://develop.svn.wordpress.org/trunk@13782 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-20 22:44:07 +00:00
Ryan Boren e61755c853 Trim trailing whitespace
git-svn-id: https://develop.svn.wordpress.org/trunk@13733 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-17 16:27:25 +00:00
Andrew Nacin 0e567e38f1 Don't allow access to network.php if running an MU network. It is only for networks created in 3.0. see #11816. Also, fix MS htaccess logic, see #12136
git-svn-id: https://develop.svn.wordpress.org/trunk@13679 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 23:53:03 +00:00
Andrew Nacin 403bf947e1 Don't check for the existence of index.php in the htaccess rewrite rules. props miqrogroove. see #11845
git-svn-id: https://develop.svn.wordpress.org/trunk@13676 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 22:58:43 +00:00
Andrew Nacin 0d3634ecbd Improve multisite rewrite rules. Construct rules dynamically and skip subdirectory-specific rules for subdomain installs. see #12136
git-svn-id: https://develop.svn.wordpress.org/trunk@13675 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 22:33:52 +00:00
Andrew Nacin ef7e0ef243 Remove dummy contextual help from network.php. We'll need some real docs. #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13656 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 03:15:09 +00:00
Andrew Nacin d6adc0701c First pass at error handling for populate_network() and network.php. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13655 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 01:51:24 +00:00
Andrew Nacin f59126029d Remove unused MU function and unnecessary separate includes file. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13644 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 08:46:05 +00:00
Andrew Nacin c2bb5992ee Store subdomain/subdirectory choice in sitemeta. For now, only used in case we return to network.php without constants. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13642 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 08:34:42 +00:00
Andrew Nacin 62569595aa Correct subdomain handling in network.php. Pass around boolean values instead of 'yes' and 'no'. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13641 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 08:17:07 +00:00
Andrew Nacin 93f0c5ee6a Expose a read-only network.php once multisite is enabled, to ensure access to original configuration such as rewrite rules. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13638 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 22:42:36 +00:00
Andrew Nacin 7b324417fb Check and error out on port numbers in Tools > Network, which aren't allowed in multisite. see #11816, see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@13637 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 22:01:49 +00:00
Andrew Nacin e71a0b3db3 Rename WP_ENABLE_MULTISITE to WP_ALLOW_MULTISITE to minimize confusion. Prevent direct access to network.php without the constant unless the install process was already started. see #11816 for network.php. see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@13634 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 19:10:07 +00:00
Andrew Nacin a2381e9bd5 Jump right to network.php step 2 when an existing network is present. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13633 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 18:58:05 +00:00
Andrew Nacin 91b380571d Allow localhost in a multisite subdirectory install. More network.php improvements. see #12457 for localhost. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13622 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 06:14:42 +00:00
Andrew Nacin 735080c7fc Add nag for missing authentication keys in network.php. See #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13614 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 21:01:58 +00:00
Andrew Nacin 3b13adaca8 Remove htaccess.ms and wp-config.ms templates. These were brought inline in [13611]. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13613 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 20:11:18 +00:00
Andrew Nacin 809684b754 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: https://develop.svn.wordpress.org/trunk@13611 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 20:01:32 +00:00
Andrew Nacin 03e39017cf Second pass, replacing accidental ms-config-sample.php change with wp-config.ms. see #12094
git-svn-id: https://develop.svn.wordpress.org/trunk@13572 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-03 07:57:44 +00:00
Andrew Nacin 2080b68e12 First pass on network.php improvements. see #12094
git-svn-id: https://develop.svn.wordpress.org/trunk@13571 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-03 07:43:32 +00:00
Ron Rennick 7f3a30a9c0 add full file paths in network install, see #12332
git-svn-id: https://develop.svn.wordpress.org/trunk@13466 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-27 18:48:43 +00:00
Andrew Nacin 4bad9d635f Ensure we have MS global tables defined during network install. See #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@13337 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-23 19:58:53 +00:00
Ryan Boren 86d7ef0b69 Trim trailing whitespace
git-svn-id: https://develop.svn.wordpress.org/trunk@13025 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-08 18:02:23 +00:00
Ron Rennick ac720d22ea Allow network install to be restarted, see #11881
git-svn-id: https://develop.svn.wordpress.org/trunk@13000 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-07 02:13:20 +00:00
Dion Hulse 22eeec9f05 set svn:eol-style native on new files
git-svn-id: https://develop.svn.wordpress.org/trunk@12910 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-31 11:55:39 +00:00
Dion Hulse eab8af1feb Bring Server Name field into style lines with rest of page. See #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@12909 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-31 11:47:53 +00:00
Ron Rennick 334a3e294a block multisite enable on localhost and ip address, see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@12883 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-27 22:10:41 +00:00
Ryan Boren 7da5c09cdc Whitespace cleanup and inline docs. Props nacin. see #12027
git-svn-id: https://develop.svn.wordpress.org/trunk@12865 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-27 13:48:37 +00:00
Ryan Boren 72adbb470e Remove trailing whitespace
git-svn-id: https://develop.svn.wordpress.org/trunk@12859 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-26 22:49:05 +00:00
Ron Rennick 795bbaaf79 Move network screen to the tools menu, See #12027
git-svn-id: https://develop.svn.wordpress.org/trunk@12830 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-25 23:07:49 +00:00