Make sure the variables are always defined. props tlovett1, danielbachhuber. fixes #24034. fixes #24112.

git-svn-id: https://core.svn.wordpress.org/trunk@24011 1a063a9b-81f0-0310-95a4-ce76da25c4cd