Commit Graph

39 Commits

Author SHA1 Message Date
Jeremy Felt 0dc18d3ffb Multisite: Use `get_sites()` in network upgrade.
Use `get_sites()` to generate the same query that was previously performed manually.

Props spacedmonkey, flixos90.
Fixes #37823.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-30 03:51:30 +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
Gary Pendergast 210e23a63d Multisite: Improve performance of the upgrade page on large networks.
The query to select the next 5 blogs to upgrade was ordered by `registered`, which isn't indexed. This causes the query to table scan, which will be slow on networks with many blogs.

The query only needs to be ordered by something that won't change, so ordering by `blog_id` is a good replacement. `blog_id` is indexed, and it's the only column being returned, so MySQL is able to optimize for a fast index read.

Props fliespl.
Fixes #37612.


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


git-svn-id: http://core.svn.wordpress.org/trunk@38170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-09 11:39:36 +00:00
Dominik Schilling 25e66e4f1e Text Changes: Unify permission error messages.
The new format looks like "Sorry, you are not allowed to <action>.". This provides a consistent experience for all error messages related to missing permissions. It also reduces the number of similar strings and allows translators to provide a consistent style in their language.

Props ramiy, Presskopp.
Fixes #34521.
Built from https://develop.svn.wordpress.org/trunk@37914


git-svn-id: http://core.svn.wordpress.org/trunk@37855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 15:16:29 +00:00
John Blackbourn 8427ebfd06 Upgrade/Install: Skip certificate verification when upgrading a network's sites. This avoids issues with self-signed certificates or otherwise invalid certificates.
Fixes #36975

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


git-svn-id: http://core.svn.wordpress.org/trunk@37661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-14 07:43:28 +00:00
Eric Lewis 22467e840f Networks and sites: Replace "blog" usage with "site" in docs.
Multisite functions use the term "blog" to refer to what we now call a "site," e.g. `get_current_blog_id()`. These functions are here to stay because of our commitment to backwards compatibility. What we can do is set the documentation straight.

See #35417.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-28 03:35:27 +00:00
Helen Hou-Sandí f3107e5842 Make some primary action buttons look primary.
* User deletion/removal
* Site status change (multisite)
* Network upgrade
* Import file upload
* Media browser upload

props Dezzy for the initial patch.
fixes #23738.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-15 03:08:24 +00:00
Sergey Biryukov 5399881b18 Merge two database update strings for consistency.
Props pavelevap.
Fixes #33514.
Built from https://develop.svn.wordpress.org/trunk@35000


git-svn-id: http://core.svn.wordpress.org/trunk@34965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-10 05:14:23 +00:00
Jeremy Felt 9926983b66 Revert [34778], continue using `_site_option()` for the current network.
The `_network_option()` parameter order will be changing to accept `$network_id` first. The `_site_option()` functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-07 17:11:25 +00:00
Jeremy Felt 54512d64cb MS: Use `*_network_option()` functions throughout core.
Replaces all uses of `*_site_option()` with the corresponding "network" function.

This excludes one usage in `wp-admin/admin-footer.php` that needs more investigation.

Props spacedmonkey.
See #28290.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-02 19:08:26 +00:00
Scott Taylor 84dbb036d1 Network Upgrade: switch `<h3>` to `<h2>`.
Props afercia.
Fixes #34082.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-29 21:29:13 +00:00
Konstantin Obenland 7dc1d06e64 Proper heading for admin screens.
First step towards restoring a good heading structure in wp-admin.
The previous `<h1>` contained the site title and a link to the front page and was removed with the toolbar refactoring in 3.2.

Props joedolson, afercia.
Fixes #31650.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-27 15:41:25 +00:00
Scott Taylor b56b9b3e5c Add `@global` annotations for `wp-admin/*`.
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-28 21:41:30 +00:00
Andrew Nacin 9e92fab289 Update wp_die() calls modified in [31658] to use shorthand calling style.
see #31422.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 03:27:27 +00:00
Dominik Schilling 64fc7294b6 Use HTTPS URLs for codex.wordpress.org.
see #27115.
Built from https://develop.svn.wordpress.org/trunk@32116


git-svn-id: http://core.svn.wordpress.org/trunk@32095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-12 21:29:32 +00:00
Sergey Biryukov 29cddbeda9 Add translator comments for placeholders in network-related strings.
props ramiy.
fixes #31834.
Built from https://develop.svn.wordpress.org/trunk@31956


git-svn-id: http://core.svn.wordpress.org/trunk@31935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-01 13:26:28 +00:00
Jeremy Felt 80d13281ed Return HTTP status code 403 in network admin when access is forbidden.
When the error message "You do not have permission to access this page" is used in network admin screens, return an HTTP status code of 403 to match. Previously: [30356] and [31300].

Props yo-l1982.

Fixes #31422.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-07 06:00:28 +00:00
Jeremy Felt aa469e2623 Optimize site query when performing network database upgrades
We only use `blog_id` from the query, so we don't need a wildcard.

props marcosf
Fixes #30097

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


git-svn-id: http://core.svn.wordpress.org/trunk@30029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-26 22:10:19 +00:00
Scott Taylor 2f513d3320 Fix some `hackificator` odds and ends in `wp-admin`:
* `wp-activate.php` and `wp-admin/themes.php` don't need the closing PHP tag
* Switch single quotes for HTML attribute values to double in a few places
* Convert `include_once file.php` syntax to `include_once( 'file.php' )`
* Add access modifiers to methods/members in: `_WP_List_Table_Compat`, `Walker_Nav_Menu_Edit`, `Walker_Nav_Menu_Checklist`, `WP_Screen`, `Walker_Category_Checklist`
* `edit_user()` doesn't need to import the `$wpdb` global
* `wp_list_widgets()` doesn't need to import the `$sidebars_widgets` global
* switch/endswitch syntax is not supported in Hack
* A `<ul>` in `wp-admin/users.php` is unclosed

See #27881.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 05:04:16 +00:00
Andrew Nacin dce0b9adea Use SSL when linking to WordPress.org. see #27115.
Built from https://develop.svn.wordpress.org/trunk@27469


git-svn-id: http://core.svn.wordpress.org/trunk@27314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-08 04:14:15 +00:00
Drew Jaynes 8eff8141ce Inline documentation for hooks in wp-admin/network/upgrade.php.
Props miyauchi for the initial patch.
Fixes #25881.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26795 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-07 04:23:11 +00:00
Andrew Ozz 8d6059b383 Remove all screen_icon() calls and deprecate the functions, props TobiasBg, fixes #26119
Built from https://develop.svn.wordpress.org/trunk@26518


git-svn-id: http://core.svn.wordpress.org/trunk@26411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 03:53: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
Andrew Nacin 4e30ca031b Clarify a database upgrade string, for 3.7.
props SergeyBiryukov.
fixes #24845.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-04 17:50:09 +00:00
Andrew Nacin 0496b1acfd Hide 'Database Upgrade Required' on admin/network/upgrade.php when you are not being asked to upgrade, to prevent confusion.
props duck_.
see #24845. see #23540.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 00:57:10 +00:00
Ryan Boren da7db424de Call them network upgrades rather than network updates to better indicate that they are DB upgrades rather than code/file upgrades.
Improve the contextual help for the Network Upgrade screen.

Props DrewAPicture
fixes #23540


git-svn-id: http://core.svn.wordpress.org/trunk@23619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-05 17:02:31 +00:00
ryan 5ca54e7d2f Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432


git-svn-id: http://core.svn.wordpress.org/trunk@21414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 17:51:42 +00:00
ryan 88b1f65116 s/Admin Bar/Toolbar/. Props ocean90. fixes #19461
git-svn-id: http://svn.automattic.com/wordpress/trunk@19569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-08 16:49:16 +00:00
ryan 8ace5a6b4c Use WP_Screen::add_help_tab(). see #19020
git-svn-id: http://svn.automattic.com/wordpress/trunk@19514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-01 02:22:07 +00:00
nacin cece838d8f More s/add_help_sidebar/set_help_sidebar/. fixes #19020.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-02 21:32:16 +00:00
ryan 366db8c10b Use add_help_sidebar(). see #19020
git-svn-id: http://svn.automattic.com/wordpress/trunk@19114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-02 05:33:53 +00:00
westi 1443193079 Help Tab text updatates. Fixes #17312 prop dougwrites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-06-01 15:37:04 +00:00
nacin 0f2672e53d Move to what will be the new Network Admin Codex page URLs. see #15314.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-18 18:27:12 +00:00
nacin 9417d79543 Move to 'Documentation on XY' in the network admin. see #15314.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16983 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-16 07:07:42 +00:00
markjaquith df1887a81a Standardize around "Update" instead of "Upgrade." props RanYanivHartstein. props latz. fixes #14107
git-svn-id: http://svn.automattic.com/wordpress/trunk@16696 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-02 21:45:47 +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 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
ryan 44799523bc Update network upgrade links. see #14435
git-svn-id: http://svn.automattic.com/wordpress/trunk@15484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-02 15:36:57 +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