Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-13 11:41:34 +01:00
Code Issues Projects Releases Wiki Activity

Build/Test Tools: Fix PHP 5.2 compatibility for grandchild methods which expect exceptions to be raised.

Browse Source 
This is due to `is_callable( 'parent::setExpectedException' )` not being supported on PHP 5.2 when the method being checked only exists on the grandparent class.

See #39822

Merges [40872] and [40873] to the 4.8 branch.

Built from https://develop.svn.wordpress.org/branches/4.8@40875


git-svn-id: http://core.svn.wordpress.org/branches/4.8@40725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-06-05 10:41:22 +00:00
parent 9398dbcbe7
commit 97dcac413f
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors/light/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/colors/light/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/css/edit-rtl.css
View File

@ -334,7 +334,7 @@ form#tags-filter {
} }
#content-resize-handle { #content-resize-handle {
background: transparent url(../images/resize.gif) no-repeat scroll right bottom; background: transparent url(../images/resize.gif) no-repeat scroll left bottom;
width: 12px; width: 12px;
cursor: row-resize; cursor: row-resize;
} }
@ -1311,7 +1311,7 @@ table.links-table {
(min-resolution: 120dpi) { (min-resolution: 120dpi) {
#content-resize-handle, #content-resize-handle,
#post-body .wp_themeSkin .mceStatusbar a.mceResize { #post-body .wp_themeSkin .mceStatusbar a.mceResize {
background: transparent url(../images/resize-2x.gif) no-repeat scroll right bottom; background: transparent url(../images/resize-2x.gif) no-repeat scroll left bottom;
-webkit-background-size: 11px 11px; -webkit-background-size: 11px 11px;
background-size: 11px 11px; background-size: 11px 11px;
} }

2
wp-admin/css/edit-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/forms-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/forms.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/login-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/login.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/themes-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/themes.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.8-RC2-40868'; $wp_version = '4.8-RC2-40875';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.