Ticket #5607: remove_admin_notices3.diff

wp-includes/rewrite.php

@@ -68 +68 @@
 
         // First, check to see if there is a 'p=N' or 'page_id=N' to match against
         preg_match('#[?&](p|page_id)=(\d+)#', $url, $values);
-        $id = intval($values[2]);
+        $id = ( isset($values[2]) ) ? intval($values[2]) : 0;
         if ( $id ) return $id;
 
         // Check to see if we are using rewrite rules
@@ -591 +591 @@
                 for ($i = 0; $i < $num_tokens; ++$i) {
                         if (0 < $i) {
                                 $queries[$i] = $queries[$i - 1] . '&';
+                        } else {
+                                $queries[$i] = '';
                         }
 
                         $query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
@@ -628 +630 @@
                         //make a list of tags, and store how many there are in $num_toks
                         $num_toks = preg_match_all('/%.+?%/', $struct, $toks);
                         //get the 'tagname=$matches[i]'
-                        $query = $queries[$num_toks - 1];
+                        $query = ( isset($queries) && is_array($queries) ) ? $queries[$num_toks - 1] : '';
 
                         //set up $ep_mask_specific which is used to match more specific URL types
                         switch ($dirs[$j]) {
@@ -721 +723 @@
                                         $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
 
                                         //do endpoints for attachments
-                                        if ($endpoint) { foreach ($ep_query_append as $regex => $ep) {
+                                        if (! empty($endpoint) ) { foreach ($ep_query_append as $regex => $ep) {
                                                 if ($ep[0] & EP_ATTACHMENT) {
                                                         $rewrite[$sub1 . $regex] = $subquery . '?' . $ep[1] . $this->preg_index(2);
                                                         $rewrite[$sub2 . $regex] = $subquery . '?' . $ep[1] . $this->preg_index(2);

wp-includes/post.php

@@ -157 +157 @@
  */
 function &get_post(&$post, $output = OBJECT, $filter = 'raw') {
         global $wpdb;
+        $null = null;
 
         if ( empty($post) ) {
                 if ( isset($GLOBALS['post']) )
                         $_post = & $GLOBALS['post'];
                 else
-                        return null;
+                        return $null;
         } elseif ( is_object($post) ) {
                 wp_cache_add($post->ID, $post, 'posts');
                 $_post = &$post;
@@ -2636 +2637 @@
         }
 }