Changeset 6592

Timestamp:

01/10/2008 08:51:07 PM (17 years ago)

Author:

westi

Message:

Notice fixing for wp-includes. See #5607 props filosofo.

Location:

trunk/wp-includes

Files:

• bookmark.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• link-template.php (modified) (2 diffs)
• post-template.php (modified) (2 diffs)
• post.php (modified) (2 diffs)
• rewrite.php (modified) (4 diffs)
• taxonomy.php (modified) (6 diffs)
• theme.php (modified) (2 diffs)

trunk/wp-includes/bookmark.php

@@ -185 +185 @@
     }
 
-    if ($show_updated) {
-        $get_updated = ", UNIX_TIMESTAMP(link_updated) AS link_updated_f ";
-    }
+    $get_updated = ( $show_updated ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
 
     $orderby = strtolower($orderby);

trunk/wp-includes/functions.php

@@ -991 +991 @@
 
 function wp_get_referer() {
-    foreach ( array( $_REQUEST['_wp_http_referer'], $_SERVER['HTTP_REFERER'] ) as $ref )
-        if ( !empty( $ref ) )
-            return $ref;
+    if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
+        return $_REQUEST['_wp_http_referer'];
+    else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) 
+        return $_SERVER['HTTP_REFERER'];
     return false;
 }

trunk/wp-includes/link-template.php

@@ -143 +143 @@
     $pagestruct = $wp_rewrite->get_page_permastruct();
 
-    if ( '' != $pagestruct && 'draft' != $post->post_status ) {
+    if ( '' != $pagestruct && isset($post->post_status) && 'draft' != $post->post_status ) {
         $link = get_page_uri($id);
         $link = str_replace('%pagename%', $link, $pagestruct);
@@ -598 +598 @@
 
     $home_root = parse_url(get_option('home'));
-    $home_root = $home_root['path'];
+    $home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
     $home_root = preg_quote( trailingslashit( $home_root ), '|' );
 

trunk/wp-includes/post-template.php

@@ -57 +57 @@
     if ( !empty($post->post_password) )
         $title = sprintf(__('Protected: %s'), $title);
-    else if ( 'private' == $post->post_status )
+    else if ( isset($post->post_status) && 'private' == $post->post_status )
         $title = sprintf(__('Private: %s'), $title);
 
@@ -444 +444 @@
             $constraint = '';
         }
+    } else {
+        $constraint = '';
     }
 

trunk/wp-includes/post.php

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

trunk/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]);
-    if ( $id ) return $id;
+    if ( preg_match('#[?&](p|page_id)=(\d+)#', $url, $values) ) {
+        $id = absint($values[2]);
+        if ($id)
+            return $id;
+    }
 
     // Check to see if we are using rewrite rules
@@ -592 +594 @@
             if (0 < $i) {
                 $queries[$i] = $queries[$i - 1] . '&';
+            } else {
+                $queries[$i] = '';
             }
 
@@ -629 +633 @@
             $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
@@ -722 +726 @@
 
                     //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);

trunk/wp-includes/taxonomy.php

@@ -507 +507 @@
 function &get_terms($taxonomies, $args = '') {
     global $wpdb;
+    $empty_array = array();
 
     $single_taxonomy = false;
@@ -546 +547 @@
         $hierarchy = _get_term_hierarchy($taxonomies[0]);
         if ( !isset($hierarchy[$child_of]) )
-            return array();
+            return $empty_array;
     }
 
@@ -552 +553 @@
         $hierarchy = _get_term_hierarchy($taxonomies[0]);
         if ( !isset($hierarchy[$parent]) )
-            return array();
+            return $empty_array;
     }
 
@@ -1582 +1583 @@
  */
 function &get_object_term_cache($id, $taxonomy) {
-    return wp_cache_get($id, "{$taxonomy}_relationships");
+    $cache = wp_cache_get($id, "{$taxonomy}_relationships");
+    return $cache;
 }
 
@@ -1728 +1730 @@
  */
 function &_get_term_children($term_id, $terms, $taxonomy) {
+    $empty_array = array();
     if ( empty($terms) )
-        return array();
+        return $empty_array;
 
     $term_list = array();
@@ -1735 +1738 @@
 
     if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
-        return array();
+        return $empty_array;
 
     foreach ( $terms as $term ) {

trunk/wp-includes/theme.php

@@ -77 +77 @@
     preg_match( '|Theme URI:(.*)$|mi', $theme_data, $theme_uri );
     preg_match( '|Description:(.*)$|mi', $theme_data, $description );
-    preg_match( '|Author:(.*)$|mi', $theme_data, $author_name );
-    preg_match( '|Author URI:(.*)$|mi', $theme_data, $author_uri );
-    preg_match( '|Template:(.*)$|mi', $theme_data, $template );
+
+    if ( preg_match( '|Author URI:(.*)$|mi', $theme_data, $author_uri ) )
+        $author_uri = clean_url( trim( $author_uri[1]) );
+    else
+        $author_uti = '';
+
+    if ( preg_match( '|Template:(.*)$|mi', $theme_data, $template ) )
+        $template = wp_kses( trim( $template[1], $themes_allowed_tags ) );
+    else
+        $template = '';
 
     if ( preg_match( '|Version:(.*)|i', $theme_data, $version ) )
@@ -99 +106 @@
     $theme_uri = clean_url( trim( $theme_uri[1] ) );
     $description = wptexturize( wp_kses( trim( $description[1] ), $themes_allowed_tags ) );
-    $template = wp_kses( trim( $template[1] ), $themes_allowed_tags );
-
-    $author_uri = clean_url( trim( $author_uri[1] ) );
-
-    if ( empty( $author_uri[1] ) ) {
-        $author = wp_kses( trim( $author_name[1] ), $themes_allowed_tags );
+
+    if ( preg_match( '|Author:(.*)$|mi', $theme_data, $author_name ) ) {
+        if ( empty( $author_uri ) ) {
+            $author = wp_kses( trim( $author_name[1] ), $themes_allowed_tags );
+        } else {
+            $author = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $author_uri, __( 'Visit author homepage' ), wp_kses( trim( $author_name[1] ), $themes_allowed_tags ) );
+        }
     } else {
-        $author = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $author_uri, __( 'Visit author homepage' ), wp_kses( trim( $author_name[1] ), $themes_allowed_tags ) );
+        $author = __('Anonymous');
     }