Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,492 Commits 48 Branches 719 Tags 907 MiB
Commit Graph

54 Commits

Author SHA1 Message Date
ryan 1a552dd029 Strip trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 02:42:15 +00:00
wpmuguru 1bb1502499 apache rewrite rule cleanup, props filosofo, fixes #13540 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 23:55:32 +00:00
nacin 077ef110c0 Improved mayday calls in network.php when a subdirectory install isn't allowed. Also, /allow_folder_install/allow_subdirectory_install/g. fixes #12884, fixes #12931. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 15:16:31 +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
markjaquith e3e565321c stripslashes() the site name before passing to populate_network(), not in it. We should always expect unslashed data. reverts [14754]. fixes #13448 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-24 19:18:30 +00:00
nacin 6da2d3102d Show warning in network.php if using a custom wp-content directory. fixes #11742. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-23 22:19:09 +00:00
nacin d58032d584 Translate some hard-coded strings. props PeteMall. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-18 04:41:08 +00:00
nacin 88bce6a716 Validation for network.php. props dremeda, see #13383. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-15 06:49:16 +00:00
nacin 81d5ac363d Add a form action to network.php. props xibe, see #13383. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-15 06:19:27 +00:00
nacin e01bcf8d2e Close wrapper div when ending network_step1 with a warning. props Caspie, fixes #13389. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-14 12:34:48 +00:00
wpmuguru 235fc1680b add subdomain explanation to network install, see #12931 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-08 15:43:00 +00:00
wpmuguru 92a5da955b add network install rule, filter & UI tweaks, see #12931 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-08 15:25:33 +00:00
nacin a7dcc7881c Link to active plugins when we block a Network upgrade due to them. props ocean90. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-05 18:43:54 +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
wpmuguru 7832748847 allow subdir multisite on ip address, see #12142 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-03 19:23:37 +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
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 149ac73766 More verbose message on how to add MS constants to one's config file. props sivel, see #12848 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-04 23:49:11 +00:00
wpmuguru 4ae3e0349f fix folder install detection in [13926], see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 03:27:08 +00:00
nacin 6a201c6b6f Switch from wp_die() to a nice error message for siteurl!=home for network.php. see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 03:24:18 +00:00
wpmuguru 8fc4bccb83 block subdomain install when install is in a folder, see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 02:04:25 +00:00
wpmuguru db03ca0c13 block enabling network when siteurl and home are not the same, see #12736 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-31 18:23:05 +00:00
nacin d2643077d7 Use actual hostname instead of example.com in subdirectory/subdomain examples. fixes #12679, props johnbillion. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-25 02:49:23 +00:00
nacin 75718ee8ef Some improvements to the network.php mod_rewrite checks. see #12255 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13782 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-20 22:44:07 +00:00
ryan e25a65b36a Trim trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-17 16:27:25 +00:00
nacin 1cb0f9042b 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: http://svn.automattic.com/wordpress/trunk@13679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 23:53:03 +00:00
nacin a4776498d3 Don't check for the existence of index.php in the htaccess rewrite rules. props miqrogroove. see #11845 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 22:58:43 +00:00
nacin 561e044ab2 Improve multisite rewrite rules. Construct rules dynamically and skip subdirectory-specific rules for subdomain installs. see #12136 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 22:33:52 +00:00
nacin 97a8320fe7 Remove dummy contextual help from network.php. We'll need some real docs. #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 03:15:09 +00:00
nacin 00c591591c First pass at error handling for populate_network() and network.php. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 01:51:24 +00:00
nacin 55e6976d96 Remove unused MU function and unnecessary separate includes file. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 08:46:05 +00:00
nacin 0069db858c Store subdomain/subdirectory choice in sitemeta. For now, only used in case we return to network.php without constants. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 08:34:42 +00:00
nacin df48ab984f Correct subdomain handling in network.php. Pass around boolean values instead of 'yes' and 'no'. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 08:17:07 +00:00
nacin 1586596d2f 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: http://svn.automattic.com/wordpress/trunk@13638 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 22:42:36 +00:00
nacin 299183fa8d Check and error out on port numbers in Tools > Network, which aren't allowed in multisite. see #11816, see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 22:01:49 +00:00
nacin c42b0e50ea 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: http://svn.automattic.com/wordpress/trunk@13634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 19:10:07 +00:00
nacin 5648e048c7 Jump right to network.php step 2 when an existing network is present. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 18:58:05 +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 64105ec06d Add nag for missing authentication keys in network.php. See #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13614 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-06 21:01:58 +00:00
nacin f77605f081 Remove htaccess.ms and wp-config.ms templates. These were brought inline in [13611]. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-06 20:11:18 +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
nacin 619765602b Second pass, replacing accidental ms-config-sample.php change with wp-config.ms. see #12094 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-03 07:57:44 +00:00
nacin 4c1b910030 First pass on network.php improvements. see #12094 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-03 07:43:32 +00:00
wpmuguru aa3e96bbd6 add full file paths in network install, see #12332 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-27 18:48:43 +00:00
nacin 7aa43e9c8b Ensure we have MS global tables defined during network install. See #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-23 19:58:53 +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
wpmuguru 830e5e5316 Allow network install to be restarted, see #11881 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-07 02:13:20 +00:00
dd32 1dd9728029 set svn:eol-style native on new files 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-31 11:55:39 +00:00
dd32 b326637c82 Bring Server Name field into style lines with rest of page. See #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-31 11:47:53 +00:00