Changeset 6189

Timestamp:

10/05/2007 04:27:48 PM (17 years ago)

Author:

ryan

Message:

Add some spacing. fixes #5137 for trunk

Location:

trunk

Files:

• wp-admin/includes/upload.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)

trunk/wp-admin/includes/upload.php

@@ -40 +40 @@
     if ( $href )
         $r .= "</a>\n";
-    $r .= "\t\t\t\t<span class='upload-file-size'>".size_format(filesize($filesystem_path))."</span>\n";
+    $size = @filesize($filesystem_path);
+    if ( !empty($size) )
+        $r .= "\t\t\t\t<span class='upload-file-size'>".size_format($size)."</span>\n";
     $r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n";
     $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n";

trunk/wp-includes/query.php

@@ -1058 +1058 @@
             $q[$item] = array_unique($q[$item]);
             $tsql = "SELECT p.ID FROM $wpdb->posts p LEFT JOIN $wpdb->term_relationships tr ON (p.ID = tr.object_id) LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) LEFT JOIN $wpdb->terms t ON (tt.term_id = t.term_id)";
-            $tsql .= "WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
-            $tsql .= "GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
+            $tsql .= " WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
+            $tsql .= " GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
 
             $post_ids = $wpdb->get_col($tsql);