Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php	(revision 7183)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/handbooks.php	(working copy)
@@ -62,10 +62,10 @@
 	 * @return array Array with public query vars.
 	 */
 	public static function add_query_vars( $public_query_vars ) {
-		$public_query_vars['is_handbook'] = false;
-		$public_query_vars['current_handbook'] = false;
-		$public_query_vars['current_handbook_home_url'] = false;
-		$public_query_vars['current_handbook_name'] = '';
+		$public_query_vars[] = 'wporg_is_handbook';
+		$public_query_vars[] = 'current_handbook';
+		$public_query_vars[] = 'current_handbook_home_url';
+		$public_query_vars[] = 'current_handbook_name';
 
 		return $public_query_vars;
 	}
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php	(revision 7183)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/search.php	(working copy)
@@ -38,7 +38,7 @@
 	 * @return array
 	 */
 	public static function default_qv_empty_post_type_search( $public_query_vars ) {
-		$public_query_vars['empty_post_type_search'] = false;
+		$public_query_vars[] = 'empty_post_type_search';
 		return $public_query_vars;
 	}