golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid 'Only variables should be passed by reference' warnings. Props SergeyBiryukov. see #18975 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-10-27 20:00:09 +00:00
parent d8892db612
commit e261ac43e7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/menu.php
View File

@ -215,7 +215,8 @@ if ( apply_filters('custom_menu_order', false) ) {
}
// Remove the last menu item if it is a separator.
$last_menu_key = array_pop( $last_menu_key = array_keys( $menu ) );
$last_menu_key = array_keys( $menu );
$last_menu_key = array_pop( $last_menu_key );
if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
unset( $menu[ $last_menu_key ] );
unset( $last_menu_key );

3
wp-includes/pomo/mo.php
View File

@ -195,7 +195,8 @@ class MO extends Gettext_Translations {
$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
if ('' === $original) {
$this->set_headers($this->make_headers($translation));
$headers = $this->make_headers($translation);
$this->set_headers($headers);
} else {
$entry = &$this->make_entry($original, $translation);
$this->entries[$entry->key()] = &$entry;