Ticket #3594: 3594.diff

wp-includes/post-template.php

@@ -368 +368 @@
                 $src_file = $icon_dir . '/' . basename($src);
         }
 
-        if ( !isset($src) )
+        if ( !isset($src) || !$src )
                 return false;
+
         return array($src, $src_file);
 }
 

wp-includes/script-loader.php

@@ -38 +38 @@
                         $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' );
                         $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' );
                         $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-                        $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20061223' );
+                        $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20070116' );
                 }
         }
 

wp-admin/upload-js.php

@@ -56 +56 @@
                                 this.currentImage.width = false;
                                 this.currentImage.height = false;
                         }
-                        this.currentImage.isImage = ( 0 == id ? '' : $('attachment-is-image-' + id).value );
+                        this.currentImage.isImage = ( 0 == id ? 0 : $('attachment-is-image-' + id).value );
                         this.currentImage.ID = id;
                 },
 
@@ -74 +74 @@
                                 h += "<a href='#' onclick='return theFileList.cancelView();'  title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')) ?></a>";
                         }
                         h += "<div id='file-title'>"
-                        if ( !this.currentImage.isImage )
+                        if ( 0 == this.currentImage.isImage )
                                 h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
                         else
                                 h += "<h2>" + this.currentImage.title + "</h2>";
@@ -83 +83 @@
                         h += "</span>";
                         h += '</div>'
                         h += "<div id='upload-file-view' class='alignleft'>";
-                        if ( this.currentImage.isImage ) {
+                        if ( 1 == this.currentImage.isImage ) {
                                 h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>";
                                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
                                 h += "</a>";
@@ -152 +152 @@
                                 h += "<a href='#' onclick='return theFileList.cancelView();'  title='<?php echo attribute_escape(__('Browse your files')); ?>' class='back'><?php echo attribute_escape(__('&laquo; Back')); ?></a>";
                         }
                         h += "<div id='file-title'>"
-                        if ( !this.currentImage.isImage )
+                        if ( 0 == this.currentImage.isImage )
                                 h += "<h2><a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo attribute_escape(__('Direct link to file')); ?>'>" + this.currentImage.title + "</a></h2>";
                         else
                                 h += "<h2>" + this.currentImage.title + "</h2>";
@@ -161 +161 @@
                         h += "</span>";
                         h += '</div>'
                         h += "<div id='upload-file-view' class='alignleft'>";
-                        if ( this.currentImage.isImage ) {
+                        if ( 1 == this.currentImage.isImage ) {
                                 h += "<a href='" + this.currentImage.srcBase + this.currentImage.src + "' onclick='return false;' title='<?php echo wp_specialchars(__('Direct link to file')); ?>'>";
                                 h += "<img src='" + ( this.currentImage.thumb ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' />";
                                 h += "</a>";
@@ -230 +230 @@
                         displayEl = $A(document.forms.uploadoptions.elements.display).detect( function(i) { return i.checked; } )
                         if ( displayEl )
                                 display = displayEl.value;
-                        else if ( this.currentImage.isImage )
+                        else if ( 1 == this.currentImage.isImage )
                                 display = 'full';
 
                         if ( 'none' != link )