Add the $query parameter to add_rewrite_tag() so that it matches...

Add the $query parameter to add_rewrite_tag() so that it matches WP_Rewrite::add_rewrite_tag(). Fixes #19871.

Also rename some other parameters so that they all match.


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