Avoid string offset notices in [25319] (merged as [25324]). Merges [25340] to 3.6.

Built from https://develop.svn.wordpress.org/branches/3.6@25341


git-svn-id: http://core.svn.wordpress.org/branches/3.6@25303 1a063a9b-81f0-0310-95a4-ce76da25c4cd