WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use explicit variable variable syntax 

PHP7 introduces a backwards compatable change to variable varibale syntax that requires us to use curly brackets to maintain the syntax between php5 and php7.  For more info, see https://wiki.php.net/rfc/uniform_variable_syntax#semantic_differences_in_existing_syntax for the semantic differences.  

Props ocean90
Fixes #31982


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


git-svn-id: http://core.svn.wordpress.org/trunk@33394 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2015-07-26 18:04:26 +00:00
parent d44c684599
commit d8eaaf66df
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-customize-setting.php
View File

@ -1103,7 +1103,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
$i = 1;
foreach ( $items as $k => $item ) {
$items[ $k ]->$args['output_key'] = $i++;
$items[ $k ]->{$args['output_key']} = $i++;
}
}

2
wp-includes/nav-menu.php
View File

@ -638,7 +638,7 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
usort($items, '_sort_nav_menu_items');
$i = 1;
foreach( $items as $k => $item ) {
$items[$k]->$args['output_key'] = $i++;
$items[$k]->{$args['output_key']} = $i++;
}
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta4-33426';
$wp_version = '4.3-beta4-33427';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.