Prevent admin breakage for `s` in `WP_Query` after [28623].

See #11330.



git-svn-id: https://develop.svn.wordpress.org/trunk@28666 602fd350-edb4-49c9-b593-d223f7449a82