Permalink
Browse files

Move is_admin() to wp-settings.php so it's available when query.php i…

…s not included.

git-svn-id: http://svn.automattic.com/wordpress/trunk@12393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent b300dea commit 1c55a42fa03f8a9a6c32209b54427127b517bbe9 azaozz committed Dec 14, 2009
Showing with 16 additions and 16 deletions.
  1. +0 −16 wp-includes/query.php
  2. +16 −0 wp-settings.php
View
@@ -86,22 +86,6 @@ function wp_reset_query() {
* Query type checks.
*/
-/**
- * Whether the current request is in WordPress admin Panel
- *
- * Does not inform on whether the user is an admin! Use capability checks to
- * tell if the user should be accessing a section or not.
- *
- * @since 1.5.1
- *
- * @return bool True if inside WordPress administration pages.
- */
-function is_admin () {
- if ( defined('WP_ADMIN') )
- return WP_ADMIN;
- return false;
-}
-
/**
* Is query requesting an archive page.
*
View
@@ -307,6 +307,22 @@ function wp_clone( $object ) {
return $can_clone ? clone( $object ) : $object;
}
+/**
+ * Whether the current request is in WordPress admin Panel
+ *
+ * Does not inform on whether the user is an admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 1.5.1
+ *
+ * @return bool True if inside WordPress administration pages.
+ */
+function is_admin() {
+ if ( defined('WP_ADMIN') )
+ return WP_ADMIN;
+ return false;
+}
+
if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
require_once (WP_CONTENT_DIR . '/object-cache.php');
$_wp_using_ext_object_cache = true;

0 comments on commit 1c55a42

Please sign in to comment.