Avoid error in ms-files.php after [25317] (merged as [25322]). Merges [25344] to 3.6.

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


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