golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,258 Commits 2 Branches 0 Tags 40 MiB
Commit Graph

6277 Commits

Author SHA1 Message Date
nacin 03eac5614c Fix notice on users admin panel. More or less reverts earlier fix, [13617]. props miqrogroove. fixes #12555 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-12 00:03:44 +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
westi 92edc853a6 Tidy up the text which describes pingbacks. Fixes #12504 props scribu. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 21:34:53 +00:00
westi da3765da55 Make the sanitity check html in the installer more poetic. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 20:45:24 +00:00
ryan 973cd7be04 Revert accidental junk. see #12186 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 20:26:24 +00:00
ryan 59873d0b4f Custom background color fixes. see #12186 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 20:21:58 +00:00
nacin 8064343648 Add valign, and formatting and i18n improvement. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 18:16:26 +00:00
nacin 95f0ba0623 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: http://svn.automattic.com/wordpress/trunk@13664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 18:02:40 +00:00
nacin 2164f43949 Simplify hackish logic. props miqrogroove. fixes #12581 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 17:30:02 +00:00
nacin f6415fc7eb Fix logic and pull static code out of a loop. fixes #12581 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 17:21:18 +00:00
nacin 20eae9d24a Use disabled() form helper. fixes #12581 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 17:12:23 +00:00
ryan c8756014d2 Allow custom post types to have custom icons. Props ptahdunbar, Denis-de-Bernardy. fixes #12434 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 17:05:16 +00:00
ryan 5d6cd5deb5 Use page icon for page menus. fixes #12583 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 16:54:47 +00:00
nacin 1f422200ee Introduce the disabled() form helper. Move selected() and checked() out of wp-admin and into full scope. see #12581 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-11 16:34:27 +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 622a4084fc Fix typo, trim whitespace. see #12460 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 23:38:05 +00:00
ryan 4fa5b08842 Menu editor fixes. Props yoavf. fixes #12545 #12566 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 20:27:42 +00:00
wpmuguru 363a752373 network options UI cleanup, see #12465 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 19:00:43 +00:00
wpmuguru c1b0c8e8c9 Display a warning when processing an unregistered setting, see #11730 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 17:44:32 +00:00
wpmuguru 0cbe9fd4c1 Delete blog to Delete site, props markmcwilliams, see #12572, code cleanup, see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 16:06:53 +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
dd32 035485998f Fix paging links "Displaying x–y of z" for Pages. Props Utkarsh. Fixes #12552 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-10 08:41:09 +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 31e7a3234f Bringing some order to the ms-options dumping ground. see #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 23:40:38 +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 4f23fbe1c7 Don't page comments by default. fixes #12562 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 21:04:41 +00:00
ryan fcbca58853 wp_get_shortlink() and pluggable shortlink generation. fixes #10640 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 19:36:38 +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
wpmuguru bfe35227d3 block invalid site names/urls in add site, see #11777 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 17:06:58 +00:00
dd32 208f98f762 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: http://svn.automattic.com/wordpress/trunk@13628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 12:03:13 +00:00
dd32 c21bb61eaf Cleanup of options.php. Adds concise&early wp_die()'s, reformats some poorly chosen branching. See #12455 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 10:57:49 +00:00
dd32 0d385b1408 Fix inline taxonomy Quick Edit. Props mdawaffe. See #12553 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-09 10:23:03 +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
ryan af1e54596c Header selector styling fixes. Props iammattthomas. see #12343 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 22:14:11 +00:00
ryan 689fb2674e Header selector styling fixes. Props iammattthomas. see #12343 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 22:10:53 +00:00
wpmuguru a7011c50ca allow existing media path on main site when converting to multisite, see #12549 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 19:52:29 +00:00
wpmuguru 6b18130fb2 move multisite upgrade functions to upgrade.php, see #11771 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 16:31:12 +00:00
nacin 9c3f4265ab Fix warning in users.php. Fixes #12555 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-08 14:30:17 +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 d6c51469c2 s/onClick/onclick/. props TobiasBg, see #12429 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-06 20:06:32 +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 f210aed76d Move $base sanity check to from MS config template to ms-settings. see #11816 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-06 19:36:35 +00:00
ryan b2c3ace49a Update ms-sites UI. Props ocean90. see #12460 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-06 18:31:10 +00:00