From 996d913b0e68d931a18fca3e042c0e0d30d79e3b Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 19 Dec 2007 17:56:16 +0000
Subject: [PATCH] Better is_admin() check from filosofo and pishmishy. fixes
 #5487

git-svn-id: https://develop.svn.wordpress.org/trunk@6412 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/admin.php    | 2 ++
 wp-includes/query.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index c0456192d6..0a6f22ae55 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,4 +1,6 @@
 <?php
+define('WP_ADMIN', TRUE);
+
 if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else
diff --git a/wp-includes/query.php b/wp-includes/query.php
index df99d681f2..fae510ea75 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -32,9 +32,9 @@ function wp_reset_query() {
  */
 
 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 () {