Ticket #31723: 31723.diff

src/wp-includes/query.php

@@ -485 +485 @@
  * @param mixed $page Page ID, title, slug, or array of such.
  * @return bool
  */
-function is_page( $page = '' ) {
+function is_page( $page = null ) {
         global $wp_query;
 
         if ( ! isset( $wp_query ) ) {
@@ -594 +594 @@
  * @param mixed $post Post ID, title, slug, or array of such.
  * @return bool
  */
-function is_single( $post = '' ) {
+function is_single( $post = null ) {
         global $wp_query;
 
         if ( ! isset( $wp_query ) ) {
@@ -4359 +4359 @@
          * @param mixed $page Page ID, title, slug, path, or array of such.
          * @return bool
          */
-        public function is_page( $page = '' ) {
-                if ( !$this->is_page )
+        public function is_page( $page = null ) {
+                if ( ! $this->is_page )
                         return false;
 
-                if ( empty( $page ) )
+                if ( is_null($page) ) {
                         return true;
+                }
 
+                if (empty( $page) )
+                        return false;
+
+
                 $page_obj = $this->get_queried_object();
 
                 $page = (array) $page;
@@ -4452 +4457 @@
          * @param mixed $post Post ID, title, slug, path, or array of such.
          * @return bool
          */
-        public function is_single( $post = '' ) {
+        public function is_single( $post = null ) {
                 if ( !$this->is_single )
                         return false;
 
-                if ( empty($post) )
+                if ( is_null($post) )
                         return true;
 
+                if ( empty($post))
+                        return false;
+
                 $post_obj = $this->get_queried_object();
 
                 $post = (array) $post;