diff -Nru /tmp/sFzkoN3asb/wordpress-2.2.2/debian/changelog /tmp/hjKTyJLtta/wordpress-2.2.2/debian/changelog
--- /tmp/sFzkoN3asb/wordpress-2.2.2/debian/changelog	2008-01-09 07:26:58.000000000 +0100
+++ /tmp/hjKTyJLtta/wordpress-2.2.2/debian/changelog	2008-01-09 07:26:59.000000000 +0100
@@ -1,3 +1,10 @@
+wordpress (2.2.2-1ubuntu2.1) gutsy-security; urgency=low
+
+  * SECURITY UPDATE: SQL injection vulnerability in wp-includes/query.php 
+    CVE-2007-6318 (LP: #181416)
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Wed, 09 Jan 2008 07:07:36 +0100
+
 wordpress (2.2.2-1ubuntu1.1) gutsy-security; urgency=low
 
   * SECURITY UPDATE: Cross-site scripting due to improper checking of
diff -Nru /tmp/sFzkoN3asb/wordpress-2.2.2/wp-admin/admin.php /tmp/hjKTyJLtta/wordpress-2.2.2/wp-admin/admin.php
--- /tmp/sFzkoN3asb/wordpress-2.2.2/wp-admin/admin.php	2007-02-15 09:16:43.000000000 +0100
+++ /tmp/hjKTyJLtta/wordpress-2.2.2/wp-admin/admin.php	2008-01-09 07:26:59.000000000 +0100
@@ -1,4 +1,5 @@
 <?php
+define('WP_ADMIN',TRUE);
 if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else
diff -Nru /tmp/sFzkoN3asb/wordpress-2.2.2/wp-includes/query.php /tmp/hjKTyJLtta/wordpress-2.2.2/wp-includes/query.php
--- /tmp/sFzkoN3asb/wordpress-2.2.2/wp-includes/query.php	2007-04-25 20:54:29.000000000 +0200
+++ /tmp/hjKTyJLtta/wordpress-2.2.2/wp-includes/query.php	2008-01-09 07:26:59.000000000 +0100
@@ -27,9 +27,9 @@
  */
 
 function is_admin () {
-	global $wp_query;
-
-	return ($wp_query->is_admin || (strpos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
+	if ( defined('WP_ADMIN') )
+		return WP_ADMIN;
+	return false;
 }
 
 function is_archive () {