From 9eded352638182f0e32633de640f6c24968df09a Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Tue, 7 Dec 2010 18:30:39 -0600
Subject: [PATCH] fix warning and add changelog

---
 docs/changelog/7.x.x.txt             | 1 +
 lib/WebGUI/Asset/Wobject/Carousel.pm | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 18b2a6290..9f91b7243 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.7
  - added #11968: use the language override in the registration form (Jukka Raimovaara / Mentalhouse Oy)
+ - Changed Carousel to use TinyMCE with WebGUI plugins
 
 7.10.6
  - fixed #11974: Toolbar icons unclickable in Webkit using HTML5
diff --git a/lib/WebGUI/Asset/Wobject/Carousel.pm b/lib/WebGUI/Asset/Wobject/Carousel.pm
index 298511a60..0e1e67951 100644
--- a/lib/WebGUI/Asset/Wobject/Carousel.pm
+++ b/lib/WebGUI/Asset/Wobject/Carousel.pm
@@ -142,14 +142,14 @@ sub getEditForm {
     my $loadMcePlugins  = $richedit->getLoadPlugins;
     my $items           = $self->get('items') ? JSON->new->decode($self->get('items'))->{items} : [];
     $items              = JSON->new->encode( $items );
-    my $i18n            = JSON->new->encode( { "delete" => $i18n->get("delete") } );
+    my $i18nJson        = JSON->new->encode( { "delete" => $i18n->get("delete") } );
 
     $tabform->getTab('properties')->raw(<<"ENDHTML");
     <div id="carouselEditor"></div>
     <script type="text/javascript">
     $loadMcePlugins
     YAHOO.util.Event.onDOMReady( function() {
-        window.carouselEditor = new WebGUI.Carousel.Editor( "carouselEditor", $config, $items, $i18n );
+        window.carouselEditor = new WebGUI.Carousel.Editor( "carouselEditor", $config, $items, $i18nJson );
     } );
     </script>
 ENDHTML