Ticket #18975: 18975.2.patch

wp-admin/includes/menu.php

@@ -215 +215 @@
 }
 
 // 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 );

wp-includes/pomo/mo.php

@@ -195 +195 @@
                         $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;