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


git-svn-id: https://develop.svn.wordpress.org/branches/3.6@25341 602fd350-edb4-49c9-b593-d223f7449a82