Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-02 16:59:35 +01:00
Code Issues Projects Releases Wiki Activity
43,793 Commits 50 Branches 747 Tags 785 MiB
972d2bc117
Commit Graph

81 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
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
nacin
65c1243ce3 More curses on PHP 5.0.5. see #13757, fixes #14160. for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-25 07:35:59 +00:00
nacin
113a26770f Fix checking for whether WP_User object is actually a user. props filosofo, fixes #13903 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-07-13 21:27:05 +00:00
ryan
703fb0a73a Don't process allowedthemes option when editing a site. Props wpmuguru. fixes #14120 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-29 14:32:49 +00:00
nacin
67aafc648c Save add_new_users ms-option. props wpmuguru, fixes #14119 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15342 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-27 20:11:59 +00:00
ryan
c74ec2cca3 Use prepare(). Props Ben Ward. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-27 19:55:55 +00:00
westi
6a42369117 Fix typo in translation. Fixes #13872 props Angeloverona. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-13 16:19:04 +00:00
ryan
e7540ea96a Warning and styling fixes. Props ocean90. fixes #13775 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-09 18:13:29 +00:00
ryan
0f1c7faf0c Fix warning. Props filosofo. fixes #13764 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-07 13:11:48 +00:00
nacin
7b2f3bd843 Numerous RTL improvements. props ocean90, TECannon. fixes #13663, fixes #13677. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-06-05 21:04:48 +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
nacin
4e3c7fddd0 Prevent super admins from shooting themselves in the foot. props jorbin. Checks blog names against an array (filterable) of reserved keywords for subdirectory installs. fixes #13304. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-26 03:13:16 +00:00
wpmuguru
dfc7ce5f38 fix warning in ms-edit.php 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 23:27:15 +00:00
nacin
ba599a19e3 Remove the on switch for global terms. install_global_terms() can be triggered in a plugin. see #12666. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-05-25 13:58:52 +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
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
nacin
f9df8a36ae s/blog/site/ in more places. props PeteMall, see #11644. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-30 01:54:32 +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
wpmuguru
e4e404ae20 don't change super admin primary site when creating new site 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-27 17:37:01 +00:00
ryan
bc0947b075 Introduce get_super_admins(). Allow hard-coding a global super_admins array and bypassing site options. fixes #12815 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-23 20:34:03 +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
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
8074b8036c Remove old bulk edit super admin code. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-06 13:26:12 +00:00
wpmuguru
dd1637ec7d fix validation on dashboard site in ms-options, fixes #12831 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-05 03:12:54 +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
7b55c4688a Move add/remove super admin out of bulk edit and into user-edit.php. Introduce grant_super_admin() and revoke_super_admin(). Link to profile.php in ms-users user row for current user. Add defensive check by forcing IS_PROFILE_PAGE on user-edit if trying to edit your own user_id. see #12460 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-04-02 06:46:07 +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
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
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
wpmuguru
47302e0188 first pass on optional global terms, see #12589 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-03-16 17:17:55 +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
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
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
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
45325c3d41 use delete_option vs update_option, see #12383 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 19:49:31 +00:00
wpmuguru
0846527d17 dont flush rewrite rules while in switch_to_blog, see #12383 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 19:34:57 +00:00
wpmuguru
871b2357b8 more ms warnings cleanup, props ocean90, see #12409 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 18:41:45 +00:00
wpmuguru
0fc4e2c9c1 cleanup confirm delete users, props ocean90, fixes #12386 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-28 16:58:17 +00:00
wpmuguru
a399b4b845 sanitize domains in ms-options, fixes #11775 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-26 23:36:26 +00:00
wpmuguru
997a564f72 prevent admins from removing themselves and main super admin from super admin list, See #11644 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-02-26 17:16:31 +00:00