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


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