Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-07-02 17:55:07 +02:00
Code Issues Projects Releases Wiki Activity
13,693 Commits 49 Branches 744 Tags 931 MiB
f7428fc146
Commit Graph

66 Commits

Author SHA1 Message Date
ryan
f7428fc146 Help text cleanup. Props zeo. fixes #13467 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-03 13:37:51 +00:00
ryan
17129fb62e Cut 'em out, move 'em on, trailing whitespace 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-02 20:04:07 +00:00
nacin
df544e3f6c Proper whitespace before and after content within a textarea on network.php. props ocean90. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-31 15:27:31 +00:00
nbachiyski
22342a502d Better detection whether we are on the Network page. Use custom constant to tell us. See #13565, props nacin 
We used to load multisite translations each time WP_ALLOW_MULTISITE was defined, but
it could lead to alot of false positives. Generic config files can include to allow
users to updgrade to multisite without further editing the config file.


git-svn-id: http://svn.automattic.com/wordpress/trunk@15064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-29 20:35:19 +00:00
nbachiyski
83d71541cf Remove a space in the beginning of a translatable string. 
It was a typo -- the space should have been between the parent and the quote.


git-svn-id: http://svn.automattic.com/wordpress/trunk@15051 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-29 12:12:48 +00:00
wpmuguru
58d8b1383d will the real host please step forward, fixes #13594 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15037 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 16:40:55 +00:00
nacin
7cdefe4851 Better branching to account for mod_rewrite mimicry. see #12758. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15026 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 02:58:21 +00:00
nacin
1e3784ca4c Add some Apache checks to some notices in network.php. see #12758. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 02:52:40 +00:00
nacin
52f9c18958 Don't tell IIS users to back up their .htaccess files. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 02:41:01 +00:00
nacin
9cb1902bd1 Use the variable set up for when the function doesn't exist. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-28 02:12:57 +00:00
nacin
c21336deba Typo (fix, not add). props duck_. see #13467. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 21:25:57 +00:00
nacin
8caed1c2a1 Help for multisite. props andrea_r, dougwrites, duck_. see #13467. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-27 21:20:23 +00:00
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