Commit Graph

57 Commits

Author SHA1 Message Date
Sergey Biryukov 1925595cd8 Networks and Sites: Exit after `wp_redirect()` in `wp-admin/ms-options.php`.
This brings more consistency with the other files having the same pattern:

* `wp-admin/moderation.php`
* `wp-admin/ms-admin.php`
* `wp-admin/ms-edit.php`
* `wp-admin/ms-sites.php`
* `wp-admin/ms-themes.php`
* `wp-admin/ms-upgrade-network.php`
* `wp-admin/ms-users.php`

Follow-up to [15481], [16847].

Props jigar-bhanushali, jorbin, johnbillion, Presskopp, rajinsharwar, audrasjb, SergeyBiryukov.
Fixes #60926.
Built from https://develop.svn.wordpress.org/trunk@58460


git-svn-id: http://core.svn.wordpress.org/trunk@57909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2024-06-22 11:47:16 +00:00
Sergey Biryukov 47ed56f38f Code Modernization: Replace `dirname( __FILE__ )` calls with `__DIR__` magic constant.
This avoids the performance overhead of the function call every time `dirname( __FILE__ )` was used instead of `__DIR__`.

This commit also includes:

* Removing unnecessary parentheses from `include`/`require` statements. These are language constructs, not function calls.
* Replacing `include` statements for several files with `require_once`, for consistency:
 * `wp-admin/admin-header.php`
 * `wp-admin/admin-footer.php`
 * `wp-includes/version.php`

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.
Built from https://develop.svn.wordpress.org/trunk@47198


git-svn-id: http://core.svn.wordpress.org/trunk@46998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-02-06 06:33:11 +00:00
Gary Pendergast aaf99e6913 Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-30 23:11:00 +00:00
Andrew Nacin fd57b239d2 Don't rely on include_path to include files.
Always use dirname() or, once available, ABSPATH.

props ketwaroo, hakre.
fixes #17092.

Built from https://develop.svn.wordpress.org/trunk@25616


git-svn-id: http://core.svn.wordpress.org/trunk@25533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-25 00:18:11 +00:00
ryan 21e3f0f7fa Network Admin, first pass. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@15481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-30 20:34:54 +00:00
nacin 34c1fa6d0b target=blank for help. props jorbin, see #13467
git-svn-id: http://svn.automattic.com/wordpress/trunk@15132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-03 21:00:39 +00:00
nacin cce031d05f Help fixes. props kpdesign, fixes #13467.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-03 19:52:54 +00:00
nacin 3e7d4c8012 Some MS help string cleanup and standardization. fixes #13467.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-03 18:55:52 +00:00
nacin bb6570a47a Remove reference to global terms from MS options help. props bigdawggi via wp-testers.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-03 02:49:52 +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 f80b6092f8 MS help fixes. props dougwrites, see #13467.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-02 05:53:24 +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
nacin 7df33632b7 Even better, remove all UI for global terms. Add a filter to global_terms_enabled() and also allow the site option to simply be deleted. fixes #12666.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-24 20:45:59 +00:00
markjaquith 20ac800bd9 Use global_terms_enabled() api function. props nacin.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14736 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-19 05:23:18 +00:00
markjaquith dfc9923e59 Cast global_terms_enabled to bool before doing checked() so that FALSE matches as well as 0.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-19 05:12:01 +00:00
nacin 946308e3f0 Wrap a label around an inline input. Same tactic we use in options-discussion. see [14668].
git-svn-id: http://svn.automattic.com/wordpress/trunk@14669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-15 19:27:02 +00:00
nacin 90849388b6 Don't have a label overlap two input boxes in ms-options. props ocean90.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-15 19:21:56 +00:00
nacin ef484c0dd0 Validation and some textarea escaping for ms-options. props Utkarsh, see #13383.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-15 05:58:57 +00:00
nacin 75c38f3492 Simple warning text for global terms. Probably not enough considering the sky will fall on your head if you enable them, but it's a start. fixes #12666.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-07 02:58:35 +00:00
ryan 7b7243d94a Strip trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:26:11 +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 53e0be05cb Remove references to the old .fade class for message divs.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-08 03:36:52 +00:00
nacin c449adb237 File-level phpdoc for multisite files.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-04 13:29:35 +00:00
nacin eb14ca3036 More MS cleanups. props ocean90. see #12460
git-svn-id: http://svn.automattic.com/wordpress/trunk@13953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-03 00:10:44 +00:00
markjaquith d510d0bdc7 Huge MS refactoring and code cleanup. see #12460. props ocean90.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-01 21:21:27 +00:00
ryan 8e4859a35c Use network_*_url(). see #12736
git-svn-id: http://svn.automattic.com/wordpress/trunk@13884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-29 21:45:31 +00:00
nacin 55ebce714a More ms-options cleanup. Add label elements, and transition to checkboxes from radios where we can. Also fix notice in global_terms_enabled post handling.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-22 06:02:04 +00:00
nacin ae94bb0fcf More cleanup of ms-options.php. Allow textarea.large-text class to be applied to inputs as well.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13795 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-22 04:19:10 +00:00
nacin 2665034055 Move the MS option for upload limit inline w/ the enabling/disabling of the upload limit.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-22 03:48:01 +00:00
nacin 2c80016b6a MS admin string improvements. fixes #12436, props mrmist.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-19 22:09:34 +00:00
wpmuguru 0c2ab53136 introduce global_terms_enabled site option, see #12589
git-svn-id: http://svn.automattic.com/wordpress/trunk@13713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-16 15:31:50 +00:00
wpmuguru a51777ea84 move allow registration setting to registration settings in ms options, see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-15 17:48:55 +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
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
wpmuguru e667fb14e0 move super admin list maintenance from ms-options to ms-users, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-25 22:11:54 +00:00
nacin 3dcd9176de s/existant/existent/
git-svn-id: http://svn.automattic.com/wordpress/trunk@13380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 20:01:37 +00:00
wpmuguru 9ee37eb920 more multisite UX rebranding, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 19:56:10 +00:00
wpmuguru a5a9f32b73 multisite UX, see #11644, add manage_ caps for super_admin, fixes #11803
git-svn-id: http://svn.automattic.com/wordpress/trunk@13301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-22 18:41:38 +00:00
nacin 17828647fe Fix notice in ms-options.php. See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-14 14:08:36 +00:00
nacin b4f362264e Don't use deprecated functions. see #11388
git-svn-id: http://svn.automattic.com/wordpress/trunk@13106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-13 10:35:10 +00:00
dd32 044cf9b83c Correctly save checkbox-style MS options and display "No" checked value correctly. See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-13 07:09:04 +00:00
ryan ba6228f2b7 Introduce get_home_url(), get_site_url(), and get_admin_url() for fetching urls by blog id. see #12119
git-svn-id: http://svn.automattic.com/wordpress/trunk@12978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-05 21:49:19 +00:00
ryan cf7da6eab8 Introduce get_available_languages(). Validate WPLANG. fixes #11774
git-svn-id: http://svn.automattic.com/wordpress/trunk@12946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-04 18:46:25 +00:00
dd32 237fac7bd6 Fix PHP Notices: Use checked() template function & initialise variables. s/WP/WordPress/ & some code formatting. See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-31 12:23:50 +00:00
ryan 4ef834c4b1 Screen icons for site admin pages. Using temp icon until new ones are done. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-20 22:35:21 +00:00
ryan 8760e7da1b Coding standards, space after if
git-svn-id: http://svn.automattic.com/wordpress/trunk@12752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-18 20:34:48 +00:00
wpmuguru 4b8c87da92 Add is_subdomain_install() to ms code - Fixes #11796
git-svn-id: http://svn.automattic.com/wordpress/trunk@12674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-08 21:25:01 +00:00
ryan adf017f6b9 Strip trailing whites from ms files. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-07 04:27:46 +00:00