Commit Graph

77 Commits

Author SHA1 Message Date
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 e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
nacin a717edca97 Always exit after wp_redirect. props filosofo, fixes #15518.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-09 18:02:54 +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
ryan 11e51b7e0e Block editing of sites in a network other than the current one. Props wpmuguru. see #14185 for 3.1
git-svn-id: http://svn.automattic.com/wordpress/trunk@15385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-12 15:01:25 +00:00
nacin 279c35a58f Add missing echo. props PhillKenoyer, fixes #14242 for trunk.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-08 23:37:43 +00:00
nacin 6c7120ff14 target=blank help fixes. props zeo, fixes #13467.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-04 03:42:43 +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
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 fc172d4d9a Help whitespace/punctuation cleanup. props zeo, see #13467.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-29 16:16:40 +00:00
wpmuguru 1c6f95023b strip www before adding subdomain when creating new site
git-svn-id: http://svn.automattic.com/wordpress/trunk@15050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-29 00:32:10 +00:00
ryan 8b50d044bd Typo fix. Props vanillalounge, markmcwilliams. fixes #13593
git-svn-id: http://svn.automattic.com/wordpress/trunk@15036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-28 16:40:13 +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
markjaquith 253c82d9b7 Misc HTML validation fixes. see #13383. props jshreve
git-svn-id: http://svn.automattic.com/wordpress/trunk@14737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-19 05:32:39 +00:00
markjaquith 3ed394e3af Revert accidental inclusion of another patch in [14734]. Doh. Reviewing that one next!
git-svn-id: http://svn.automattic.com/wordpress/trunk@14735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-19 05:15:06 +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 31b71cd5c0 Use echo esc_html, not esc_html_e, which also translates.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-18 04:58:18 +00:00
nacin 537ea525c6 Validation for ms-sites.php. props Utkarsh, see #13383.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-15 20:05:24 +00:00
nacin c6d21e7fbb Introduce _ex(), a hybrid between _e() and _x() -- translate with context, then echo. props westi, see #13395.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-14 21:46:25 +00:00
nacin c13744a051 Valid HTML in ms-users and ms-sites. props Utkarsh, see #13383.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-14 15:03:23 +00:00
nbachiyski bebd1b8ea6 Differentiate spam strings by subject: comments, sites, and users. Props dimadin. Fixes #13199
git-svn-id: http://svn.automattic.com/wordpress/trunk@14407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:37:07 +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
nacin e64a657575 s/blog/site/ in even more places. props PeteMall, see #11644.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 03:17:49 +00:00
nacin bebdadc1b0 Restore radios for MS site flags, as the schema supports other values. see #12832
git-svn-id: http://svn.automattic.com/wordpress/trunk@14277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-28 08:15:45 +00:00
ryan f4ccd9cac3 Fix paging numbers. Props ocean90. fixes #13082
git-svn-id: http://svn.automattic.com/wordpress/trunk@14188 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-22 17:59:21 +00:00
nacin c72cecbc5d Small fix to [14102]. props ocean90. see #12889
git-svn-id: http://svn.automattic.com/wordpress/trunk@14103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-16 13:45:56 +00:00
nacin c882ea05ac Fix the blog settings checkboxes on ms-sites.php. fixes #12889
git-svn-id: http://svn.automattic.com/wordpress/trunk@14102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-16 13:35:44 +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 7278f682f2 In ms-sites.php blog, display 'mature' option for root blog. Also, small styling cleanups.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-06 23:13:44 +00:00
nacin 8ac9523cb0 Remove old bulk actions MS sites code.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-06 18:17:21 +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 2361cdd745 Some more MS cleanups. see #12460
git-svn-id: http://svn.automattic.com/wordpress/trunk@13965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-03 11:15:51 +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 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 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 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 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
wpmuguru 21f661bdf0 warnings cleanup, dont show removed user in edit site, fixes #12409
git-svn-id: http://svn.automattic.com/wordpress/trunk@13460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-27 17:27:34 +00:00
nacin 1409dcca90 Don't use deprecated functions. Fixes #12377 props filosofo.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13423 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-26 00:41:23 +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 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
wpmuguru 0ee2237e6c prevent editing site domain/path on multisite main site, see #12177
git-svn-id: http://svn.automattic.com/wordpress/trunk@13039 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-09 18:03:46 +00:00