Commit Graph

6274 Commits

Author SHA1 Message Date
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
Peter Westwood
09fdceae63 Tidy up the text which describes pingbacks. Fixes #12504 props scribu.
git-svn-id: https://develop.svn.wordpress.org/trunk@13672 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 21:34:53 +00:00
Peter Westwood
bb7b2b24a8 Make the sanitity check html in the installer more poetic.
git-svn-id: https://develop.svn.wordpress.org/trunk@13670 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 20:45:24 +00:00
Ryan Boren
c55c95bbb0 Revert accidental junk. see #12186
git-svn-id: https://develop.svn.wordpress.org/trunk@13669 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 20:26:24 +00:00
Ryan Boren
a1d788a893 Custom background color fixes. see #12186
git-svn-id: https://develop.svn.wordpress.org/trunk@13668 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 20:21:58 +00:00
Andrew Nacin
727e407dcb Add valign, and formatting and i18n improvement.
git-svn-id: https://develop.svn.wordpress.org/trunk@13665 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 18:16:26 +00:00
Andrew Nacin
26890f0131 get_blog_count() returns a number, not an object. Also, i18n fixes -- add plural string, and translator context. see #12531 for get_blog_count() discussion. see #12409 for ms-sites cleanup.
git-svn-id: https://develop.svn.wordpress.org/trunk@13664 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 18:02:40 +00:00
Andrew Nacin
82bc5eb308 Simplify hackish logic. props miqrogroove. fixes #12581
git-svn-id: https://develop.svn.wordpress.org/trunk@13663 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 17:30:02 +00:00
Andrew Nacin
e22682a5dc Fix logic and pull static code out of a loop. fixes #12581
git-svn-id: https://develop.svn.wordpress.org/trunk@13662 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 17:21:18 +00:00
Andrew Nacin
8d0a3589c9 Use disabled() form helper. fixes #12581
git-svn-id: https://develop.svn.wordpress.org/trunk@13661 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 17:12:23 +00:00
Ryan Boren
a4ac7f25ee Allow custom post types to have custom icons. Props ptahdunbar, Denis-de-Bernardy. fixes #12434
git-svn-id: https://develop.svn.wordpress.org/trunk@13660 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 17:05:16 +00:00
Ryan Boren
e333b6925a Use page icon for page menus. fixes #12583
git-svn-id: https://develop.svn.wordpress.org/trunk@13659 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 16:54:47 +00:00
Andrew Nacin
90182075c0 Introduce the disabled() form helper. Move selected() and checked() out of wp-admin and into full scope. see #12581
git-svn-id: https://develop.svn.wordpress.org/trunk@13658 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-11 16:34:27 +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
10a2ebb829 Fix typo, trim whitespace. see #12460
git-svn-id: https://develop.svn.wordpress.org/trunk@13654 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 23:38:05 +00:00
Ryan Boren
970bda3701 Menu editor fixes. Props yoavf. fixes #12545 #12566
git-svn-id: https://develop.svn.wordpress.org/trunk@13651 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 20:27:42 +00:00
Ron Rennick
0b9d0bbfe0 network options UI cleanup, see #12465
git-svn-id: https://develop.svn.wordpress.org/trunk@13649 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 19:00:43 +00:00
Ron Rennick
8de3d20dc2 Display a warning when processing an unregistered setting, see #11730
git-svn-id: https://develop.svn.wordpress.org/trunk@13646 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 17:44:32 +00:00
Ron Rennick
c466a4bf82 Delete blog to Delete site, props markmcwilliams, see #12572, code cleanup, see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@13645 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 16:06:53 +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
Dion Hulse
0b6f00c0c1 Fix paging links "Displaying x–y of z" for Pages. Props Utkarsh. Fixes #12552
git-svn-id: https://develop.svn.wordpress.org/trunk@13643 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-10 08:41:09 +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
cb3661a145 Bringing some order to the ms-options dumping ground. see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@13639 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 23:40:38 +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
1c91399612 Don't page comments by default. fixes #12562
git-svn-id: https://develop.svn.wordpress.org/trunk@13636 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 21:04:41 +00:00
Ryan Boren
96ace89041 wp_get_shortlink() and pluggable shortlink generation. fixes #10640
git-svn-id: https://develop.svn.wordpress.org/trunk@13635 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 19:36:38 +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
Ron Rennick
372f453254 block invalid site names/urls in add site, see #11777
git-svn-id: https://develop.svn.wordpress.org/trunk@13630 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 17:06:58 +00:00
Dion Hulse
e9374ebc17 Load WP_HTTP dependencies (translation support) for setup-config.php. Prevents a WSOD on attempted installs where external HTTP requests are blocked and/or timeout. Fixes #12514
git-svn-id: https://develop.svn.wordpress.org/trunk@13628 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 12:03:13 +00:00
Dion Hulse
528d441b24 Cleanup of options.php. Adds concise&early wp_die()'s, reformats some poorly chosen branching. See #12455
git-svn-id: https://develop.svn.wordpress.org/trunk@13627 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 10:57:49 +00:00
Dion Hulse
969ed4c5f8 Fix inline taxonomy Quick Edit. Props mdawaffe. See #12553
git-svn-id: https://develop.svn.wordpress.org/trunk@13624 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 10:23:03 +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
Ryan Boren
88268d637d Header selector styling fixes. Props iammattthomas. see #12343
git-svn-id: https://develop.svn.wordpress.org/trunk@13621 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-08 22:14:11 +00:00
Ryan Boren
0543da42ca Header selector styling fixes. Props iammattthomas. see #12343
git-svn-id: https://develop.svn.wordpress.org/trunk@13620 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-08 22:10:53 +00:00
Ron Rennick
13aa99629a allow existing media path on main site when converting to multisite, see #12549
git-svn-id: https://develop.svn.wordpress.org/trunk@13619 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-08 19:52:29 +00:00
Ron Rennick
830efa5339 move multisite upgrade functions to upgrade.php, see #11771
git-svn-id: https://develop.svn.wordpress.org/trunk@13618 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-08 16:31:12 +00:00
Andrew Nacin
40b0dea470 Fix warning in users.php. Fixes #12555
git-svn-id: https://develop.svn.wordpress.org/trunk@13617 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-08 14:30:17 +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
8b6b16cb2a s/onClick/onclick/. props TobiasBg, see #12429
git-svn-id: https://develop.svn.wordpress.org/trunk@13612 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 20:06:32 +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
8995a960b9 Move $base sanity check to from MS config template to ms-settings. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13610 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 19:36:35 +00:00
Ryan Boren
7850523e62 Update ms-sites UI. Props ocean90. see #12460
git-svn-id: https://develop.svn.wordpress.org/trunk@13609 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 18:31:10 +00:00
Dion Hulse
97d62bb8ce GUU: Add Update breakdown to Title attribute of update bubble. See #12517
git-svn-id: https://develop.svn.wordpress.org/trunk@13607 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 13:22:56 +00:00
Dion Hulse
ea2b254de0 Code standards cleanup for wp-admin/options-general.php
git-svn-id: https://develop.svn.wordpress.org/trunk@13606 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 09:49:11 +00:00
Dion Hulse
6200c24c13 Fix HTML Validation. Props wahgnube. Fixes #12530.
git-svn-id: https://develop.svn.wordpress.org/trunk@13605 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-06 09:47:38 +00:00