Changeset 1746

Timestamp:

10/05/2004 07:36:50 AM (20 years ago)

Author:

saxmatt

Message:

Fix GUID generation

Location:

trunk

Files:

• wp-admin/edit-comments.php (modified) (2 diffs)
• wp-admin/upgrade-functions.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/edit-comments.php

@@ -7 +7 @@
 require_once('admin-header.php');
 if (empty($_GET['mode'])) $mode = 'view';
-else $mode = $_GET['mode'];
+else $mode = htmlspecialchars($_GET['mode']);
 ?>
 
@@ -107 +107 @@
 <form action="" method="get">
 <p class="submit">
-<input type="hidden" name="offset" value="<?php echo $_GET['offset']+ 1; ?>" />
+<input type="hidden" name="offset" value="<?php echo $_GET['offset'] + 1; ?>" />
 <input type="submit" name="submit" value="<?php _e('View Next 20 Comments &raquo;');?>" />
 </p>

trunk/wp-admin/upgrade-functions.php

@@ -34 +34 @@
 
     $wpdb->query("UPDATE $wpdb->options SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
-                                                      WHERE option_name LIKE 'links_rating_image%'
-                                                      AND option_value LIKE 'wp-links/links-images/%'");
+    WHERE option_name LIKE 'links_rating_image%'
+    AND option_value LIKE 'wp-links/links-images/%'");
 
     $done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
@@ -149 +149 @@
             $post_excerpt = addslashes(deslash($post->post_excerpt));
             if ( empty($post->guid) )
-                $guid = get_option('home') . '/' . get_permalink();
+                $guid = get_permalink($post->ID);
             else
                 $guid = $post->guid;
@@ -195 +195 @@
     // Update comments table to use comment_type
     $wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
-    $wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
+    $wpdb->query("UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
 
 }

trunk/wp-includes/functions.php

@@ -301 +301 @@
 function get_settings($setting) {
   global $wpdb, $cache_settings, $cache_nonexistantoptions;
-    if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || strstr($_SERVER['REQUEST_URI'], 'wp-admin/upgrade.php') )
+    if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') )
         return false;