Index: wp-includes/query.php
===================================================================
--- wp-includes/query.php	(revision 6405)
+++ wp-includes/query.php	(working copy)
@@ -32,9 +32,9 @@
  */
 
 function is_admin () {
-	global $wp_query;
-
-	return ($wp_query->is_admin || (stripos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
+	if ( defined('WP_ADMIN') ) 
+		return WP_ADMIN;
+	return false;
 }
 
 function is_archive () {
Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php	(revision 6405)
+++ wp-admin/admin.php	(working copy)
@@ -1,4 +1,5 @@
 <?php
+define('WP_ADMIN',TRUE);
 if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else