Merge branch 'master' into Item13525

foswiki · Jul 30, 2015 · 77a5011 · 77a5011
2 parents 49374a6 + c40e1ae
commit 77a5011
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
@@ -30,8 +30,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '9.03';
-our $RELEASE           = '29 Jul 2015';
+our $VERSION           = '9.04';
+our $RELEASE           = '30 Jul 2015';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION  = 'A Wikiwyg Editor';
 our $baseWeb;

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js
@@ -2360,7 +2360,7 @@ $.NatEditor.prototype.initLinkDialog = function(elem, data) {
       if (typeof(item.label) !== "undefined") {
         return $("<li></li>")
           .data("item.autocomplete", item)
-          .append("<a><table width='100%'><tr><td width='60px'><img width='50' src='"+item.img+"' /></td><td>"+item.label+"<br />"+item.comment+"</td></tr></table></a>")
+          .append("<a><table width='100%'><tr>"+(typeof(item.img) !== 'undefined' ? "<td width='60px'><img width='50' src='"+item.img+"' /></td>":"")+"<td>"+item.label+"<br />"+item.comment+"</td></tr></table></a>")
           .appendTo(ul);
       }
     };

diff --git a/core/tools/bulk_copy.pl b/core/tools/bulk_copy.pl
@@ -487,18 +487,6 @@ sub saveTopicRev {
  #debug "SAVE $web.$topic author $info->{author} rev $info->{version}\n$data\n";
     return 0 if $control{check_only};
 
-    # When saving over existing revs of a topic, must make sure we
-    # fully delete the existing data
-    if ( $session->topicExists( $web, $topic ) ) {
-        my $demo = Foswiki::Meta->new( $session, $web, $topic );
-        $demo->removeFromStore();
-
-        $mo = Foswiki::Meta->new( $session, $web, $topic );
-        $mo->setEmbeddedStoreForm($data);
-
-        $info = $mo->get('TOPICINFO');
-    }
-
     $mo->save(
         author           => $info->{author},
         forcenewrevision => 1,