Commit Graph

19676 Commits

Author SHA1 Message Date
ryan d286875515 switch_to_blog() and restore_current_blog() housekeeping.
wp-includes/admin-bar.php:

* Replace get_admin_url() and get_home_url() with admin_url() and home_url() and place them inside a switch/restore. Likewise replace current_user_can_for_blog() with current_user_can(). This avoids doing multiple switch restores.

wp-includes/ms-blogs.php:

* Deprecate the $validate argument to switch_to_blog(). This avoids a not very necessary call to get_blog_details(), possibly saving a few queries.
* Use $_wp_switched and $_wp_switched_stack instead of $switched and $switched_stack to make it less likely these globals will be stomped.
* Use GLOBALS to access blog_id and other globals. I've preferred this style lately since it makes it obvious a global is being used and avoids global blog_id being stomped by a local variable.
* Lose some is_object() checks. wp_get_current_user() always returns an object, for example.
* Call the new WP_Roles::reinit() method.

wp-includes/class-wp-xmlrpc-server.php:

* Replace current_user_can_for_blog() with current_user_can() and move it inside the switch/restore pair. This eliminates a switch/restore.

wp-includes/capabilities.php:

* Use array_keys() instead of $role => $data since $data is unused. I *think* this is a bit faster.
* Introduce WP_Roles::reinit(). This reinitializes WP_Roles and is used after switch_to_blog() has already update the blog ID in the wpdb object. If a global roles array is being used instead of the db, reinit is skipped.
* current_user_can_for_blog() now does a switch/restore. It didn't before meaning it could be reinitializing the user with the wrong role information for the current blog.

wp-includes/ms-settings.php:

* Define $_wp_switched_stack and $_wp_switched. This way switch_to_blog() and restore_current_blog() can rely on it being set.

wp-settings.php:

* Instantiate the WP_Roles global. This was it is always defined during init. To remove the WP_Roles checks from WP_Role and WP_User this would probably have to move before plugins are loaded, which might not be a good thing.

wp-includes/functions.php:

* Update wp_upload_dir() to reference _wp_switched.



git-svn-id: http://core.svn.wordpress.org/trunk@21485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-09 16:28:15 +00:00
ryan 14ecba530b Move get_current_blog_id() to load.php so it is available during multisite bootstrap. fixes #21432
git-svn-id: http://core.svn.wordpress.org/trunk@21484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-09 13:17:14 +00:00
lancewillett 5fd1d828a6 Twenty Twelve: fix bypostauthor styling, probs obenland and SergeyBiryukov (also improves the RTL layout, see #21441).
git-svn-id: http://core.svn.wordpress.org/trunk@21483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 19:10:22 +00:00
lancewillett 7ef95f756b Twenty Twelve: add basic styles for IE7 and IE8, supports basic layout now with the small-nav styles. Props obenland, closes #21440.
git-svn-id: http://core.svn.wordpress.org/trunk@21482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 18:03:59 +00:00
azaozz cbc9aabfa4 When WP_Dependencies accept a string for a single dependency, make sure the string is not empty, see #20683
git-svn-id: http://core.svn.wordpress.org/trunk@21481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 17:21:24 +00:00
ryan 87dc511c0f Undeprecate *_blog_option() by popular demand. Put them back in ms-blogs.php since direct inclusion of ms-blogs.php/ms-functions.php is unforntunately common.
see #21432


git-svn-id: http://core.svn.wordpress.org/trunk@21480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 17:11:15 +00:00
lancewillett a83649d755 Twenty Twelve: cleanup up extra space in functions.php
git-svn-id: http://core.svn.wordpress.org/trunk@21479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 16:59:15 +00:00
lancewillett ab2b32c6a9 Twenty Twelve: better gallery columns support, and CSS cleanup. Closes #21475, props philiparthurmoore and pdclark.
git-svn-id: http://core.svn.wordpress.org/trunk@21478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 16:38:21 +00:00
lancewillett e220162063 Twenty Twelve: fix for long words getting hidden in widgets. Props DrewAPicture, closes #21503.
git-svn-id: http://core.svn.wordpress.org/trunk@21477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 16:21:14 +00:00
lancewillett 5280582df1 Twenty Twelve: make nav toggle button same height as other buttons.
git-svn-id: http://core.svn.wordpress.org/trunk@21476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 16:14:36 +00:00
lancewillett 2099053853 Twenty Twelve: add polyfill JS for matchMedia rules, avoids JS error in older IE versions. See #21440.
git-svn-id: http://core.svn.wordpress.org/trunk@21475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 16:13:32 +00:00
westi c702fe6657 Multisite: Fix the new get_space_used() function to correctly calculate Megabytes used and update some phpdoc. Props SergeyBiryukov.
git-svn-id: http://core.svn.wordpress.org/trunk@21474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 07:17:33 +00:00
nacin f02bacd9f1 Declare, document, and protect $dbuser, $dbpassword, $dbname, $dbhost and $dbh in wpdb.
These properties, while protected, are still accessible thanks to the magic getter added in [21472].

props pento, nvartolomei, joelhardi. fixes #18510.



git-svn-id: http://core.svn.wordpress.org/trunk@21473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:28:57 +00:00
nacin 1425762319 Lazy-load column info in wpdb. props pento. fixes #20838.
git-svn-id: http://core.svn.wordpress.org/trunk@21472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:24:59 +00:00
nacin 4e5fd4de46 Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.
props simonwheatley, pento. fixes #18451.



git-svn-id: http://core.svn.wordpress.org/trunk@21471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:13:48 +00:00
nacin 73c74cf8f7 Deprecate wpdb::supports_collation() in favor of wpdb::has_cap().
props hakre, pento. fixes #16757.



git-svn-id: http://core.svn.wordpress.org/trunk@21470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:06:57 +00:00
azaozz 7de126df1f Fix typo in wp_login_form(), props greenshady, fixes #21514
git-svn-id: http://core.svn.wordpress.org/trunk@21469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-07 23:13:31 +00:00
azaozz cb618f5858 TinyMCE: fix typo in button tooltips.
git-svn-id: http://core.svn.wordpress.org/trunk@21468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-07 03:28:20 +00:00
nacin 3d479c0b51 Hide the charset setting for installs that have a charset of UTF-8 already. fixes #21507.
git-svn-id: http://core.svn.wordpress.org/trunk@21467 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-07 03:10:59 +00:00
bumpbot e27c374cf0 Compress scripts/styles: 3.5-alpha-21466.
git-svn-id: http://core.svn.wordpress.org/trunk@21466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 22:58:30 +00:00
azaozz 45469ac3a8 Fix .screen-reader-text in RTL, see #21471
git-svn-id: http://core.svn.wordpress.org/trunk@21465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 21:29:27 +00:00
lancewillett 850adce105 Twenty Twelve: update author archive markup and styles, props klagraff. Fixes #21494.
git-svn-id: http://core.svn.wordpress.org/trunk@21464 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 21:05:02 +00:00
bumpbot 704304d6fe Compress scripts/styles: 3.5-alpha-21463.
git-svn-id: http://core.svn.wordpress.org/trunk@21463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 20:58:37 +00:00
lancewillett 7b9d8c1491 Twenty Twelve: line-height style fixes, props chellycat. See #21486.
* For entry titles match larger screen style with the base styles to add a bit more line-height.
 * Add line-height to entry-content and entry-summary, so that elements appearing outside of paragraph tags inside these containers will still have the appropriate line-heights.
 * Add line-height for pingbacks, which looks a bit too tight when pingbacks span multiple lines.


git-svn-id: http://core.svn.wordpress.org/trunk@21462 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 20:48:47 +00:00
azaozz 01cb9e569e CSS cleanup: remove references to .wp-menu-toggle, props ocean90, fixes #21502
git-svn-id: http://core.svn.wordpress.org/trunk@21461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 19:59:28 +00:00
bumpbot cbacfc849c Compress scripts/styles: 3.5-alpha-21460.
git-svn-id: http://core.svn.wordpress.org/trunk@21460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 18:58:29 +00:00
azaozz 853df37fe8 Replace last remaining gradients with css, standardize the gradient css cascade, props ocean90, fixes #16461
git-svn-id: http://core.svn.wordpress.org/trunk@21459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 17:21:41 +00:00
bumpbot 59eb150fdc Compress scripts/styles: 3.5-alpha-21458.
git-svn-id: http://core.svn.wordpress.org/trunk@21458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 04:58:26 +00:00
azaozz 6a5a3a81b6 Accessibility: enhance the Screen Options and Help tabs open/close, see #21326
git-svn-id: http://core.svn.wordpress.org/trunk@21457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 04:26:37 +00:00
bumpbot 6ce8c8872b Compress scripts/styles: 3.5-alpha-21456.
git-svn-id: http://core.svn.wordpress.org/trunk@21456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 02:58:33 +00:00
koopersmith 35c324c0ef Align headings and form elements on tags and categories pages. After seven and a half years... props hanni. fixes #21496.
git-svn-id: http://core.svn.wordpress.org/trunk@21455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 02:32:55 +00:00
nacin a69abc1f47 Docs for wp-activate.php. props lgedeon. fixes #20429.
git-svn-id: http://core.svn.wordpress.org/trunk@21454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:59:34 +00:00
bumpbot f8ce3f7163 Compress scripts/styles: 3.5-alpha-21453.
git-svn-id: http://core.svn.wordpress.org/trunk@21453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:58:32 +00:00
azaozz 4ef4df2f3e Accessibility: add off-screen Log Out link in the toolbar, tweak the class names of the accessible links in #adminbar, see #21312
git-svn-id: http://core.svn.wordpress.org/trunk@21452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:34:44 +00:00
lancewillett edbe047def Twenty Twelve: fix searchform styling issues and simplify selectors even more. Fixes #21478, props hd-J and jkudish.
git-svn-id: http://core.svn.wordpress.org/trunk@21451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:30:52 +00:00
lancewillett 15ca4e3e89 Twenty Twelve: generalize form styles so plugins that insert things like contact forms will fit in. Props ryanimel, see #21477.
git-svn-id: http://core.svn.wordpress.org/trunk@21450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:19:29 +00:00
lancewillett c431b810d2 Twenty Twelve: check for empty variable for simpler logic, props jkudish. See #21479.
git-svn-id: http://core.svn.wordpress.org/trunk@21449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:01:32 +00:00
lancewillett bbd8dfb103 Twenty Twelve: standardize label used for Web Fonts option. Props jkudish, fixes #21487.
git-svn-id: http://core.svn.wordpress.org/trunk@21448 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 23:58:12 +00:00
lancewillett fba5363fce Twenty Twelve: widget style fikes, align the ".timesince" class in the Twitter widget to the right like Twenty Eleven does. Props chellycat, see #21477.
git-svn-id: http://core.svn.wordpress.org/trunk@21447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 23:48:13 +00:00
lancewillett f79fe8ac32 Twenty Twelve: Position the stats smiley in a happy place, and add Plugins rule block. See #21477, props iandstewart.
git-svn-id: http://core.svn.wordpress.org/trunk@21446 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 23:41:59 +00:00
lancewillett e6afa58c20 Twenty Twelve: style acronym element same as dfn and abbr, props DrewAPicture. Fixes #21484.
git-svn-id: http://core.svn.wordpress.org/trunk@21445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 23:11:11 +00:00
lancewillett e9c6360474 Twenty Twelve: hide category and tag output in post meta if only 1 term. Props ryanimel, jkudish and fixes #21479.
git-svn-id: http://core.svn.wordpress.org/trunk@21444 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 23:04:32 +00:00
bumpbot fc62ad5e57 Compress scripts/styles: 3.5-alpha-21443.
git-svn-id: http://core.svn.wordpress.org/trunk@21443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:58:29 +00:00
lancewillett a6a135300d Twenty Twelve, apply RSS styles from r21436 to RTL stylesheet, props SergeyBiryukov. Fixes #21476.
git-svn-id: http://core.svn.wordpress.org/trunk@21442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:56:50 +00:00
lancewillett 2c7e03611a Twenty Twelve, RTL: per azaozz, center the editor body in RTL to stop messing with calculating height/width in JS. Props obenland, see #21441.
git-svn-id: http://core.svn.wordpress.org/trunk@21441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:54:47 +00:00
lancewillett 8cfd109c27 Twenty Twelve: use inline-block for clickable titles, props klagraff and iandstewart.
git-svn-id: http://core.svn.wordpress.org/trunk@21440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:42:46 +00:00
azaozz 83d04bb82a CSS cleanup: take out -moz-box-shadow, fixes #21482
git-svn-id: http://core.svn.wordpress.org/trunk@21439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:41:49 +00:00
lancewillett 06e354c14f Twenty Twelve: better button styles for consistent look across browsers. Props obenland, fixes #21473.
git-svn-id: http://core.svn.wordpress.org/trunk@21438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:39:26 +00:00
lancewillett 22fa9e4f74 Twenty Twelve: only show excerpt on search view, not full content.
Props bradthomas127 and obenland. See #21462.


git-svn-id: http://core.svn.wordpress.org/trunk@21437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:27:22 +00:00
lancewillett 94ec99851d Twenty Twelve: style up the RSS widget output to match Recent Posts better. Props SergeyBiryukov and obenland, see #21476.
git-svn-id: http://core.svn.wordpress.org/trunk@21436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:20:35 +00:00