Commit Graph

42 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
Drew Jaynes
36b3f1707c Hooks: Standardize naming of dynamic hooks using values derived from superglobals to use interpolation vs concatenation.
This is a continuation of the work that happened in [38307] for #37748.

Props ramiy.
Fixes #42698.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-12-01 11:36:50 +00:00
Jeremy Felt
3d19ab1ce2 Multisite: Remove redundant is_multisite() checks in network admin templates.
`wp-admin/network/admin.php` is required by all of the individual network templates and begins with an `is_multisite()` check of its own. Because of this, we can remove the 26 other checks in the individual templates.

Props flixos90.
Fixes #37447.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-27 15:39:29 +00:00
Drew Jaynes
9ae5e43ac8 Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-admin/network/*.
Affects DocBlocks for the following hooks:
* `network_admin_edit_' . $_GET['action']`
* `network_sites_updated_message_' . $_GET['updated']`

See #30552.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 11:21:22 +00:00
Drew Jaynes
6e15f77e5a Inline documentation for hooks in wp-admin/network/edit.php and wp-admin/network/users.php.
Props aralbald for the initial patch.
Fixes #25728.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-30 16:04:09 +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
e00bc528b6 Redirect to network_admin_url() in network/edit.php. props PeteMall, fixes #18379.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-18 06:17:47 +00:00
nacin
0caf6ee451 Dissolve wp-admin/network/edit.php. props PeteMall, fixes #18379.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-18 02:29:06 +00:00
nacin
ae91e0dfcd Move network/settings.php POST handling out of network/edit.php. props PeteMall, see #18379.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-11 22:32:35 +00:00
azaozz
5256d7951f <!DOCTYPE html> for all, fixes #18202
git-svn-id: http://svn.automattic.com/wordpress/trunk@18460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-07-22 00:25:41 +00:00
ryan
b345e996c7 Pagination fixes. Props garyc40. fixes #16357
git-svn-id: http://svn.automattic.com/wordpress/trunk@17361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-25 19:20:20 +00:00
ryan
4ffa4e4f4e Don't pass deprecated arg to update_blog_status(). Props PeteMall. fixes #15605
git-svn-id: http://svn.automattic.com/wordpress/trunk@17360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-25 17:39:10 +00:00
westi
5268a0e7d8 Fix the bulk actions on Network > Sites and Network > Users. Fixes #16364
git-svn-id: http://svn.automattic.com/wordpress/trunk@17359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-25 14:34:41 +00:00
nacin
53f10213b6 Don't use deprecated arguments. props PeteMall, see #15605.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-13 08:39:26 +00:00
nacin
f80939fdc2 Prevent notices in the allblogs and allusers branches. props SergeyBiryukov, see #15920.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-23 19:45:19 +00:00
ryan
e8468d167a Revert get_users_of_blog() to 3.0 behavior and deprecate. Use get_users() in core. Props scribu. fixes #15854
git-svn-id: http://svn.automattic.com/wordpress/trunk@17084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-20 16:25:35 +00:00
nacin
c00788260a s/id/ID/. props ocean90, fixes #15868.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-18 17:23:31 +00:00
nacin
31b4959b1b Minor cleanups.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-16 07:41:38 +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
nacin
057ed950e7 Fix a sprintf call. props wojtek.szkutnik, sorich87. fixes #14555.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-07 20:41:43 +00:00
ryan
72a9848aa5 Fix notice. Props ocean90. fixes #15692
git-svn-id: http://svn.automattic.com/wordpress/trunk@16772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-07 19:00:58 +00:00
westi
ef90a47ff8 Always exit after we redirect.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-03 12:37:43 +00:00
westi
4b3fa56caf Actions and Filters for the Network Admin sites panel to make it easier to add custom actions.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-03 12:12:44 +00:00
westi
76a6b6c246 Add a nonce check on the confirm links in the Network Admin stage one.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-23 12:10:01 +00:00
ryan
e3d61691fa Could not bulk edit users in Network Admin due to reversed logic on capability check, and incorrect action included for comparing to nonce. Props beaulebens
git-svn-id: http://svn.automattic.com/wordpress/trunk@16501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-20 05:48:35 +00:00
ryan
f5282d040d Check delete_site and delete_sites caps. Check for delete_user is more places.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-12 16:35:28 +00:00
nacin
f269b75d7b Network admin multisite checks and docs. see #14435.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-10 14:27:15 +00:00
ryan
a9e5ade43f Add new user page for network admin. Props PeteMall. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@16183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-04 16:16:52 +00:00
nacin
17654e64a5 Remove old ajax handler. props PeteMall, see #14897.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-31 18:20:09 +00:00
markjaquith
fc6e89da45 Expand submit_button() capabilities. Replace all (or almost all) manual HTML instances in WP. props sbressler. see #15064
git-svn-id: http://svn.automattic.com/wordpress/trunk@16061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-28 21:56:43 +00:00
ryan
57fe65fd6d Fix bulk network users nonce. Props duck_. fixes #15168
git-svn-id: http://svn.automattic.com/wordpress/trunk@15905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-21 20:20:50 +00:00
ryan
012bb5278c Tabbed interface for site editing. see #15174
git-svn-id: http://svn.automattic.com/wordpress/trunk@15903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-21 18:35:52 +00:00
ryan
23bc3f7fe6 Move add site form to site-new.php. see #15174
git-svn-id: http://svn.automattic.com/wordpress/trunk@15886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-21 13:49:49 +00:00
nacin
5e1184aa57 Pinking shears.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-19 07:48:22 +00:00
ryan
72a9626c15 Allow flagging of a blog as mature via a URL. Move some actions into update_blog_status(). Props Viper007Bond. fixes #14385
git-svn-id: http://svn.automattic.com/wordpress/trunk@15836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-18 18:53:47 +00:00
scribu
799baf139c Use submit_button() in more places. See #15064
git-svn-id: http://svn.automattic.com/wordpress/trunk@15830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-17 18:24:34 +00:00
ryan
9c31fd7c70 First pass of user admin. Network admin and screen cleanups. see #14696
git-svn-id: http://svn.automattic.com/wordpress/trunk@15746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-07 19:34:18 +00:00
scribu
a97ad3f654 Fix redirection when saving network settings. Fixes #14970
git-svn-id: http://svn.automattic.com/wordpress/trunk@15669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-26 23:18:43 +00:00
scribu
7ae94106b4 Fix MS Sites nonce. See #14579
git-svn-id: http://svn.automattic.com/wordpress/trunk@15602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-09 10:17:31 +00:00
ryan
11dc4a27bc Move confirm_delete_users() to edit.php. Update links in edit.php. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@15488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 18:10:43 +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