Index: /branches/release-29/default_templates/comment_form.mtml
===================================================================
--- /branches/release-29/default_templates/comment_form.mtml (revision 1101)
+++ /branches/release-29/default_templates/comment_form.mtml (revision 1309)
@@ -6,8 +6,8 @@
             <div id="comment-form-external-auth">
                 <script type="text/javascript">
-                <!--
+                /* <![CDATA[ */
                 <MTIf name="comment_preview_template">is_preview = true;</MTIf>
                 writeCommenterGreeting(commenter_name, <$MTEntryID$>, <$MTEntryBlogID$>, commenter_id, commenter_url);
-                //-->
+                /* ]]> */
                 </script>
             </div>
Index: /branches/release-29/plugins/StyleCatcher/tmpl/view.tmpl
===================================================================
--- /branches/release-29/plugins/StyleCatcher/tmpl/view.tmpl (revision 1098)
+++ /branches/release-29/plugins/StyleCatcher/tmpl/view.tmpl (revision 1309)
@@ -12,5 +12,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
     var repoImg = "<mt:var name="plugin_static_uri">images/mixed-media.gif";
     var selected;
@@ -493,5 +493,5 @@
         });
     }
-// -->
+/* ]]> */
 </script>
 <!-- end stylecatcher script section -->
Index: /branches/release-29/plugins/MultiBlog/tmpl/dialog_create_trigger.tmpl
===================================================================
--- /branches/release-29/plugins/MultiBlog/tmpl/dialog_create_trigger.tmpl (revision 1104)
+++ /branches/release-29/plugins/MultiBlog/tmpl/dialog_create_trigger.tmpl (revision 1309)
@@ -30,5 +30,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var dialog;
 
@@ -74,5 +74,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/plugins/MultiBlog/tmpl/blog_config.tmpl
===================================================================
--- /branches/release-29/plugins/MultiBlog/tmpl/blog_config.tmpl (revision 1098)
+++ /branches/release-29/plugins/MultiBlog/tmpl/blog_config.tmpl (revision 1309)
@@ -1,4 +1,4 @@
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var multiBlogRebuilds = new Array();
 <TMPL_LOOP NAME=REBUILDS_LOOP>
@@ -47,5 +47,5 @@
     rebuildMultiBlogTriggerTable();
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/plugins/WidgetManager/default_widgets/monthly_archive_dropdown.mtml
===================================================================
--- /branches/release-29/plugins/WidgetManager/default_widgets/monthly_archive_dropdown.mtml (revision 1104)
+++ /branches/release-29/plugins/WidgetManager/default_widgets/monthly_archive_dropdown.mtml (revision 1309)
@@ -14,4 +14,5 @@
 </div>
 <script type="text/javascript" charset="utf-8">
+/* <![CDATA[ */
 function nav(sel) {
    if (sel.selectedIndex == -1) return;
@@ -19,5 +20,6 @@
    if (opt && opt.value)
       location.href = opt.value;
-}    
+}
+/* ]]> */
 </script>
         </mt:ArchiveListFooter>
Index: /branches/release-29/plugins/WidgetManager/default_widgets/signin.mtml
===================================================================
--- /branches/release-29/plugins/WidgetManager/default_widgets/signin.mtml (revision 1104)
+++ /branches/release-29/plugins/WidgetManager/default_widgets/signin.mtml (revision 1309)
@@ -4,5 +4,5 @@
     <div class="widget-content">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var name, id, url, blog_ids;
 if (typeof(commenter_name) != 'undefined')
@@ -60,5 +60,5 @@
     }
 }
-//-->
+/* ]]> */
 </script>
     </div>
Index: /branches/release-29/plugins/WidgetManager/tmpl/edit.tmpl
===================================================================
--- /branches/release-29/plugins/WidgetManager/tmpl/edit.tmpl (revision 1118)
+++ /branches/release-29/plugins/WidgetManager/tmpl/edit.tmpl (revision 1309)
@@ -5,5 +5,5 @@
 <script type="text/javascript" src="<mt:var name="static_uri">plugins/WidgetManager/js/app.js"></script>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var colWidth = 350;
 var modWidth = 275;
@@ -285,5 +285,5 @@
 
 TC.attachLoadEvent( init );
--->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/plugins/WidgetManager/tmpl/list.tmpl
===================================================================
--- /branches/release-29/plugins/WidgetManager/tmpl/list.tmpl (revision 1212)
+++ /branches/release-29/plugins/WidgetManager/tmpl/list.tmpl (revision 1309)
@@ -5,5 +5,5 @@
 <script type="text/javascript" src="<mt:var name="static_uri">plugins/WidgetManager/js/app.js"></script>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var tableSelect;
 function init() {
@@ -14,5 +14,5 @@
 
 TC.attachLoadEvent( init );
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/wizard/optional.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/optional.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/optional.tmpl (revision 1309)
@@ -9,5 +9,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function go(mode) {
     var f = document.forms[0];
@@ -37,5 +37,5 @@
     return true;
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/wizard/complete.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/complete.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/complete.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function go(mode) {
     var f = document.forms[0];
@@ -24,5 +24,5 @@
     }
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/wizard/cfg_dir.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/cfg_dir.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/cfg_dir.tmpl (revision 1309)
@@ -10,10 +10,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function go(mode) {
     var f = document.forms[0];
     f['__mode'].value = mode;
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/wizard/start.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/start.tmpl (revision 1251)
+++ /branches/release-29/tmpl/wizard/start.tmpl (revision 1309)
@@ -109,5 +109,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function getByID(n, d) {
     if (!d) d = document;
@@ -123,5 +123,5 @@
     el.style.display = 'none';
 }
-// -->
+/* ]]> */
 </script>
     </mt:setvarblock>
@@ -146,5 +146,5 @@
 </style>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function js_check() {
     if (! openManual ) {
@@ -155,5 +155,5 @@
 }
 window.onload = js_check;
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/wizard/packages.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/packages.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/packages.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function go(mode) {
     var f = document.forms[0];
@@ -37,5 +37,5 @@
     }
 }
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/wizard/configure.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/configure.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/configure.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var needValidate = true;
 
@@ -98,5 +98,5 @@
 </mt:unless>
 
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/wizard/blog.tmpl
===================================================================
--- /branches/release-29/tmpl/wizard/blog.tmpl (revision 1101)
+++ /branches/release-29/tmpl/wizard/blog.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var needValidate = false;
 
@@ -16,5 +16,5 @@
     f['__mode'].value = mode;
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/edit_role.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_role.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_role.tmpl (revision 1309)
@@ -31,5 +31,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function toggleAndUncheck(obj, target) {
     if (!obj || !target) {
@@ -216,5 +216,5 @@
 TC.attachLoadEvent( rectifyAll );
 
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/cfg_plugin.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_plugin.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/cfg_plugin.tmpl (revision 1309)
@@ -120,5 +120,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var last_shown;
     <mt:if name="can_config">
@@ -174,5 +174,5 @@
     }
     </mt:if>
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_blog.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_blog.tmpl (revision 1308)
+++ /branches/release-29/tmpl/cms/list_blog.tmpl (revision 1309)
@@ -29,5 +29,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var tableSelect;
     function init()
@@ -39,5 +39,5 @@
 
     TC.attachLoadEvent( init );
-    //-->
+    /* ]]> */
     </script> 
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/edit_template.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_template.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_template.tmpl (revision 1309)
@@ -148,5 +148,5 @@
 <script type="text/javascript" src="<mt:var name="static_uri">js/tc/client.js"></script>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var tag_inserts = {};
 var snippets = [];
@@ -437,5 +437,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
@@ -610,5 +610,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 App.singletonConstructor =
 MT.App = new Class( MT.App, {
@@ -626,5 +626,5 @@
 
 } );
--->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_entry.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_entry.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_entry.tmpl (revision 1309)
@@ -69,5 +69,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function enableFilterButton(fld) {
     if (fld && (fld.id == "author_id-val" || fld.id == "asset_id-val")) {
@@ -153,5 +153,5 @@
 
 TC.attachLoadEvent( init );
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/edit_commenter.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_commenter.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_commenter.tmpl (revision 1309)
@@ -90,5 +90,5 @@
 <mt:unless name="tab_commenter">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var tableSelect;
 function init()
@@ -99,5 +99,5 @@
 }
 TC.attachLoadEvent(init);
-// -->
+/* ]]> */
 </script>
 </mt:unless>
Index: /branches/release-29/tmpl/cms/cfg_system_general.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_system_general.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/cfg_system_general.tmpl (revision 1309)
@@ -24,5 +24,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function clearWeblogCloneSource() {
     var el_name = getByID("new_user_template_blog_name");
@@ -62,5 +62,5 @@
     return true;
 }
--->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_member.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_member.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_member.tmpl (revision 1309)
@@ -13,5 +13,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function toggleFilter() {
         var filterActive = getByID("filter-title");
@@ -83,5 +83,5 @@
     }
     TC.attachLoadEvent( init );
-    // -->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/backup.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/backup.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/backup.tmpl (revision 1309)
@@ -93,7 +93,7 @@
     <mt:if name="open_dialog">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     openDialog(false, 'dialog_restore_upload', 'magic_token=<mt:var name="magic_token">&amp;files=<mt:var name="files">&amp;assets=<mt:var name="assets">&amp;current_file=<mt:var name="filename">&amp;last=<mt:var name="last">&amp;schema_version=<mt:var name="schema_version">&amp;redirect=1;');
-    //-->
+    /* ]]> */
     </script>
     </mt:if>
Index: /branches/release-29/tmpl/cms/include/chromeless_header.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/chromeless_header.tmpl (revision 1114)
+++ /branches/release-29/tmpl/cms/include/chromeless_header.tmpl (revision 1309)
@@ -33,5 +33,5 @@
 
 <script language="javascript" type="text/javascript">
-<!--
+/* <![CDATA[ */
 function showByID(id) {
     var el = getByID(id);
@@ -42,5 +42,5 @@
     if (el) el.style.display = "none";
 }
-// -->
+/* ]]> */
 </script>
 <$mt:var name="js_include"$>
Index: /branches/release-29/tmpl/cms/include/pagination.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/pagination.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/include/pagination.tmpl (revision 1309)
@@ -28,6 +28,8 @@
 <mt:if name="pager_json">
 <script type="text/javascript" charset="utf-8">
+/* <![CDATA[ */
     pager_<$mt:var name="bar_position" default="top"$> = new Pager(TC.elementOrId('pagination-<$mt:var name="bar_position" default="top"$>'));
     pager_<$mt:var name="bar_position" default="top"$>.setState(<$mt:var name="pager_json"$>);
+/* ]]> */
 </script>
 </mt:if>
Index: /branches/release-29/tmpl/cms/include/backup_end.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/backup_end.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/include/backup_end.tmpl (revision 1309)
@@ -3,10 +3,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var progress = getByID("progress-bar");
 if (progress) {
     progress.style.display = "none";
 }
-// -->
+/* ]]> */
 </script>
 
@@ -47,4 +47,5 @@
 </form>
 <script type="text/javascript">
+/* <![CDATA[ */
 var timer;
 
@@ -61,4 +62,5 @@
 
 timer = window.setTimeout("submit_form()", 3000);
+/* ]]> */
 </script>
 <p id="download_message"><strong><__trans phrase="_BACKUP_DOWNLOAD_MESSAGE"></strong></p>
Index: /branches/release-29/tmpl/cms/include/footer.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/footer.tmpl (revision 1114)
+++ /branches/release-29/tmpl/cms/include/footer.tmpl (revision 1309)
@@ -54,7 +54,7 @@
 <mt:if name=open_dialog> 
 <script type="text/javascript"> 
-<!-- 
+/* <![CDATA[ */
 openDialog(false, '<mt:var name="dialog_mode">', '<mt:var name="dialog_params">'); 
-//--> 
+/* ]]> */
 </script> 
 </mt:if> 
@@ -62,7 +62,7 @@
 <mt:unless name="delayed_bootstrap">
 <script type="text/javascript">
-    // <![CDATA[
+    /* <![CDATA[ */
         App.bootstrapInline( false );
-    // ]]>
+    /* ]]> */
 </script>
 </mt:unless>
Index: /branches/release-29/tmpl/cms/include/itemset_action_widget.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/itemset_action_widget.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/include/itemset_action_widget.tmpl (revision 1309)
@@ -1,8 +1,10 @@
 <mt:if name="has_list_actions">
 <script type="text/javascript">
+/* <![CDATA[ */
 <mt:loop name="list_actions">itemset_options['<mt:var name="key">'] = {type:'core'<mt:if name="input">,input:'<mt:var name="input_label" escape="js">'</mt:if><mt:if name="continue_prompt">,continue_prompt:"<mt:var name="continue_prompt" escape="js">"</mt:if><mt:if name="dialog">,dialog:1</mt:if><mt:if name="js">,js:'<mt:var name="js" escape="js">'</mt:if><mt:if name="min">,min:'<mt:var name="min" escape="js">'</mt:if><mt:if name="max">,max:'<mt:var name="max" escape="js">'</mt:if>};
 </mt:loop>
 <mt:loop name="more_list_actions">itemset_options['<mt:var name="key">'] = {type:'plugin'<mt:if name="input">,input:'<mt:var name="input_label" escape="js">'</mt:if><mt:if name="continue_prompt">,continue_prompt:"<mt:var name="continue_prompt" escape="js">"</mt:if><mt:if name="dialog">,dialog:1</mt:if><mt:if name="js">,js:'<mt:var name="js" escape="js">'</mt:if><mt:if name="min">,min:'<mt:var name="min" escape="js">'</mt:if><mt:if name="max">,max:'<mt:var name="max" escape="js">'</mt:if>};
 </mt:loop>
+/* ]]> */
 </script>
 <div style="position:relative; display:inline;">
Index: /branches/release-29/tmpl/cms/include/backup_start.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/backup_start.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/include/backup_start.tmpl (revision 1309)
@@ -7,8 +7,10 @@
     
 <script type="text/javascript">
+/* <![CDATA[ */
 function progress(str, id) {
     var el = getByID(id);
     if (el) el.innerHTML = str;
 }
+/* ]] */
 </script>
 
Index: /branches/release-29/tmpl/cms/include/asset_upload.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/asset_upload.tmpl (revision 1198)
+++ /branches/release-29/tmpl/cms/include/asset_upload.tmpl (revision 1309)
@@ -1,4 +1,4 @@
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function setExtraPath(sel) {
    var opt = sel.options[sel.selectedIndex];
@@ -8,5 +8,5 @@
    if (middle) middle.value = path;
 }
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/include/header.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/header.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/include/header.tmpl (revision 1309)
@@ -44,4 +44,5 @@
 </mt:if>
     <script type="text/javascript">
+        /* <![CDATA[ */
         CMSScriptURI = '<$mt:var name="mt_url"$>';
         ScriptURI = '<$mt:var name="script_url"$>';
@@ -49,4 +50,5 @@
         StaticURI = '<$mt:var name="static_uri"$>';
         HelpBaseURI = '<$mt:var name="help_url"$>';
+        /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/include/import_end.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/include/import_end.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/include/import_end.tmpl (revision 1309)
@@ -3,10 +3,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var progress = getByID("progress-bar");
 if (progress) {
     progress.style.display = "none";
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/view_log.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/view_log.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/view_log.tmpl (revision 1309)
@@ -60,5 +60,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function doResetLog(f) {
         if (confirm('<__trans phrase="Are you sure you want to reset the activity log?" escape="singlequotes">')) {
@@ -103,5 +103,5 @@
 
     TC.attachLoadEvent( init );
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/setup_initial_blog.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/setup_initial_blog.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/setup_initial_blog.tmpl (revision 1309)
@@ -11,5 +11,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 window.onload = init;
 
@@ -101,5 +101,5 @@
     f.submit();
 }
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/cfg_spam.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_spam.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/cfg_spam.tmpl (revision 1309)
@@ -58,5 +58,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function scoreNudge(amount) {
     var fld = getByID('junk_score_threshold');
@@ -71,5 +71,5 @@
     return false;
 }
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/edit_folder.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_folder.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_folder.tmpl (revision 1309)
@@ -21,5 +21,5 @@
 
 <script type="text/javascript">
-<!-- 
+/* <![CDATA[ */
 function validate(form) {    
     if (form.label.value.match(/\S/,''))
@@ -54,5 +54,5 @@
 }
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_notification.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_notification.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_notification.tmpl (revision 1309)
@@ -42,5 +42,5 @@
 
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var current_edit = 0;
     var old_note_email = '';
@@ -163,5 +163,5 @@
 
     TC.attachLoadEvent( init );
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/export.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/export.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/export.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function validate(f) {
     if (!f['blog_id'].value) {
@@ -15,5 +15,5 @@
     return openDialog(this.form, 'dialog_select_weblog', 'multi=0&amp;return_args=__mode%3Dstart_export');
 }
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/edit_category.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_category.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_category.tmpl (revision 1309)
@@ -21,5 +21,5 @@
 
 <script type="text/javascript">
-<!-- 
+/* <![CDATA[ */
 function validate(form) {    
     if (form.label.value.match(/\S/,''))
@@ -54,5 +54,5 @@
 }
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/dialog/asset_userpic.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_userpic.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/dialog/asset_userpic.tmpl (revision 1309)
@@ -1,5 +1,5 @@
 <mt:include name="dialog/header.tmpl">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var field = window.parent.getByID( '<mt:var name="edit_field">' );
 if (field) field.value = '<mt:var name="asset_id" escape="JS">';
@@ -14,5 +14,5 @@
 }
 closeDialog();
-//-->
+/* ]]> */
 </script>
 <mt:include name="dialog/footer.tmpl">
Index: /branches/release-29/tmpl/cms/dialog/restore_end.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/restore_end.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/restore_end.tmpl (revision 1309)
@@ -3,10 +3,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var progress = getByID("progress-bar");
 if (progress) {
     progress.style.display = "none";
 }
-// -->
+/* ]]> */
 </script>
 
@@ -85,4 +85,5 @@
 </div>
 <script type="text/javascript">
+/* <![CDATA[ */
 function submit_form() {
     var f = document['next_page'];
@@ -101,4 +102,5 @@
     DOM.removeClassName(getByID('next-page-button'), 'hidden');
 }
+/* ]]> */
 </script>
 <p id="message"><__trans phrase="The page will redirect to a new page in 3 seconds. [_1]Stop the redirect.[_2]" params="<a href='javascript:void(0)' onclick='return stopTimer()'>%%</a>"></p>
Index: /branches/release-29/tmpl/cms/dialog/asset_list.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_list.tmpl (revision 1118)
+++ /branches/release-29/tmpl/cms/dialog/asset_list.tmpl (revision 1309)
@@ -9,5 +9,5 @@
 
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function dialogClose(data) {
         if (!data) {
@@ -47,5 +47,5 @@
     }
     TC.attachLoadEvent( init );
-    // -->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/asset_replace.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_replace.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/dialog/asset_replace.tmpl (revision 1309)
@@ -2,10 +2,10 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function submit_form(f, command) {
     f['overwrite_' + command].value = 1;
     return true;
 }
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/refresh_templates.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/refresh_templates.tmpl (revision 1248)
+++ /branches/release-29/tmpl/cms/dialog/refresh_templates.tmpl (revision 1309)
@@ -6,5 +6,5 @@
 <script type="text/javascript" src="<mt:var name="static_uri">js/dialog.js"></script>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function enable(id) {
     var el = getByID(id);
@@ -40,5 +40,5 @@
 }
 TC.attachLoadEvent(init);
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/comment_reply.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/comment_reply.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/comment_reply.tmpl (revision 1309)
@@ -3,7 +3,7 @@
 <mt:if name="closing">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 closeDialog('<mt:var name="return_url">');
-//-->
+/* ]]> */
 </script>
 </mt:if>
Index: /branches/release-29/tmpl/cms/dialog/select_weblog.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/select_weblog.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/select_weblog.tmpl (revision 1309)
@@ -8,5 +8,5 @@
     
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var dialog;
 
@@ -99,5 +99,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/dialog/restore_upload.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/restore_upload.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/dialog/restore_upload.tmpl (revision 1309)
@@ -6,5 +6,5 @@
 
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var dialog;
     var panels;
@@ -48,5 +48,5 @@
 
     TC.attachLoadEvent(init);
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/header.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/header.tmpl (revision 1114)
+++ /branches/release-29/tmpl/cms/dialog/header.tmpl (revision 1309)
@@ -39,4 +39,5 @@
 <$mt:var name="js_include"$>
 <script type="text/javascript">
+/* <![CDATA[ */
 ScriptURI = '<mt:var name="script_url">';
 ScriptBaseURI = '<mt:var name="script_base_url">';
@@ -44,4 +45,5 @@
 HelpBaseURI = '<mt:var name="help_url">';
 window.onkeypress = dialogKeyPress;
+/* ]]> */
 </script>
 </head>
Index: /branches/release-29/tmpl/cms/dialog/entry_notify.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/entry_notify.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/entry_notify.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function doValidateNotifyRecips(f) {
     if (f.send_notify_list && f.send_notify_list.checked)
@@ -14,5 +14,5 @@
     return true;
 }
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/asset_options.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_options.tmpl (revision 1102)
+++ /branches/release-29/tmpl/cms/dialog/asset_options.tmpl (revision 1309)
@@ -6,5 +6,5 @@
     <script type="text/javascript" src="<mt:var name="static_uri">js/tc/client.js"></script>
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var tag_delim = '<mt:var name="auth_pref_tag_delim">';
 
@@ -94,5 +94,5 @@
     }
 
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/adjust_sitepath.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/adjust_sitepath.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/adjust_sitepath.tmpl (revision 1309)
@@ -3,5 +3,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function validate (f) {
     var items = TC.getElementsByClassName('path_field');
@@ -52,5 +52,5 @@
     return true;
 }
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/asset_options_image.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_options_image.tmpl (revision 1118)
+++ /branches/release-29/tmpl/cms/dialog/asset_options_image.tmpl (revision 1309)
@@ -1,4 +1,4 @@
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function calcDim (val, type, full) {
         return val.value;
@@ -65,5 +65,5 @@
     }
 
-    //-->
+    /* ]]> */
     </script>
 
Index: /branches/release-29/tmpl/cms/dialog/footer.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/footer.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/footer.tmpl (revision 1309)
@@ -1,7 +1,7 @@
     <div id="bootstrapper" class="hidden"></div>
     <script type="text/javascript">
-        // <![CDATA[
+        /* <![CDATA[ */
             App.bootstrapInline( false );
-        // ]]>
+        /* ]]> */
     </script>
     </div><!-- /content -->
Index: /branches/release-29/tmpl/cms/dialog/create_association.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/create_association.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/create_association.tmpl (revision 1309)
@@ -37,5 +37,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var dialog;
 var panels;
@@ -72,5 +72,5 @@
 
 TC.attachLoadEvent(init);
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/dialog/restore_start.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/restore_start.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/restore_start.tmpl (revision 1309)
@@ -3,10 +3,10 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function progress(str, id) {
     var el = document.getElementById(id);
     if (el) el.innerHTML = str;
 }
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/dialog/select_users.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/select_users.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/dialog/select_users.tmpl (revision 1309)
@@ -8,5 +8,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var dialog;
 
@@ -57,5 +57,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/dialog/asset_insert.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/dialog/asset_insert.tmpl (revision 1104)
+++ /branches/release-29/tmpl/cms/dialog/asset_insert.tmpl (revision 1309)
@@ -4,8 +4,8 @@
 </mt:setvarblock>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 <mt:var name="insert_script">
 closeDialog();
-//-->
+/* ]]> */
 </script>
 <mt:include name="dialog/footer.tmpl">
Index: /branches/release-29/tmpl/cms/cc_return.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cc_return.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/cc_return.tmpl (revision 1309)
@@ -1,3 +1,4 @@
 <script type="text/javascript">
+/* <![CDATA[ */
 function getByID (d, n) {
     if (d.getElementById)
@@ -16,3 +17,4 @@
     e.style.display = 'block';
 window.close();
+/* ]]> */
 </script>
Index: /branches/release-29/tmpl/cms/handshake_return.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/handshake_return.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/handshake_return.tmpl (revision 1309)
@@ -1,3 +1,4 @@
 <script type="text/javascript">
+/* <![CDATA[ */
 function getByID (d, n) {
     if (d.getElementById)
@@ -10,3 +11,4 @@
 getByID(d, 'save_token_msg').style.display='block';
 window.close();
+/* ]]> */
 </script>
Index: /branches/release-29/tmpl/cms/list_banlist.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_banlist.tmpl (revision 1224)
+++ /branches/release-29/tmpl/cms/list_banlist.tmpl (revision 1309)
@@ -3,5 +3,5 @@
 <MTSetVarBlock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function setCreateMode () {
     getByID('create-ip').style.display = 'none';
@@ -27,5 +27,5 @@
 
 TC.attachLoadEvent( init );
-// -->
+/* ]]> */
 </script>
 </MTSetVarBlock>
Index: /branches/release-29/tmpl/cms/list_ping.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_ping.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_ping.tmpl (revision 1309)
@@ -85,5 +85,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function enableFilterButton() {
     getByID("filter-button").style.display = "inline";
@@ -131,5 +131,5 @@
 }
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_role.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_role.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_role.tmpl (revision 1309)
@@ -29,5 +29,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var tableSelect;
     function init()
@@ -38,5 +38,5 @@
     }
     TC.attachLoadEvent( init );
-    // -->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_comment.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_comment.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_comment.tmpl (revision 1309)
@@ -91,5 +91,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function enableFilterButton() {
     getByID("filter-button").style.display = "inline";
@@ -147,5 +147,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/install.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/install.tmpl (revision 1101)
+++ /branches/release-29/tmpl/cms/install.tmpl (revision 1309)
@@ -27,4 +27,5 @@
 
 <script type="text/javascript">
+/* <![CDATA[ */
 window.onload = init;
 
@@ -85,5 +86,5 @@
     return true;
 }
-
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_tag.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_tag.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_tag.tmpl (revision 1309)
@@ -51,5 +51,5 @@
 
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
 //trans("The tag '[_2]' already exists. Are you sure you want to merge '[_1]' with '[_2]'?");
 //trans("The tag '[_2]' already exists. Are you sure you want to merge '[_1]' with '[_2]' across all blogs?");
@@ -194,5 +194,5 @@
 
     TC.attachLoadEvent( init );
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_template.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_template.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_template.tmpl (revision 1309)
@@ -19,5 +19,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var tableSelect;
 function init() {
@@ -52,5 +52,5 @@
     TC.removeClassName(t, "show-all");
 }
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/edit_author.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_author.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_author.tmpl (revision 1309)
@@ -40,5 +40,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function reveal_api_password() {
     var pw = getByID("api_password");
@@ -129,5 +129,5 @@
 
 TC.attachLoadEvent(init);
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/widget/blog_stats.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/widget/blog_stats.tmpl (revision 1103)
+++ /branches/release-29/tmpl/cms/widget/blog_stats.tmpl (revision 1309)
@@ -6,4 +6,5 @@
     </mt:if>
     <script type="text/javascript">
+    /* <![CDATA[ */
     function showRecentEntriesByTag(el_div, res) {
         var result = eval('(' + res.responseText + ')');
@@ -104,5 +105,5 @@
         </mt:if>
         blogStatsTabs = new Array('comment','entry'<mt:if name="tag_cloud">,'tag'</mt:if>);
-    //-->
+        /* ]]> */
     </script>
     <mt:var name="tab_html_head">
Index: /branches/release-29/tmpl/cms/widget/blog_stats_entry.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/widget/blog_stats_entry.tmpl (revision 1232)
+++ /branches/release-29/tmpl/cms/widget/blog_stats_entry.tmpl (revision 1309)
@@ -2,4 +2,5 @@
     <mt:if name="stat_url">
 <script type="text/javascript">
+    /* <![CDATA[ */
     var slider_variable = '<__trans phrase="Entries" escape="js">';
     var slider_variable_singular = '<__trans phrase="Entry" escape="js">';
@@ -9,4 +10,5 @@
     entriesSlider.setFlashvars("lcId=" + lcId);
     entriesSlider.setFlashvars("flashSource=http://www.measuremap.com/developer/slider/&contentLicense=http://creativecommons.org/licenses/by/2.0/");
+    /* ]]> */
 </script>
     </mt:if>
@@ -20,7 +22,7 @@
         <mt:if name="stat_url">
         <script type="text/javascript">
-        <!--
+        /* <![CDATA[ */
         entriesSlider.write(document);
-        // -->
+        /* ]]> */
         </script>
 
Index: /branches/release-29/tmpl/cms/widget/blog_stats_comment.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/widget/blog_stats_comment.tmpl (revision 1232)
+++ /branches/release-29/tmpl/cms/widget/blog_stats_comment.tmpl (revision 1309)
@@ -2,4 +2,5 @@
     <mt:if name="stat_url">
 <script type="text/javascript">
+    /* <![CDATA[ */
     var slider_variable = '<__trans phrase="Comments" escape="js">';
     var slider_variable_singular = '<__trans phrase="Comment" escape="js">';
@@ -9,4 +10,5 @@
     commentsSlider.setFlashvars("lcId=" + lcId);
     commentsSlider.setFlashvars("flashSource=http://www.measuremap.com/developer/slider/&contentLicense=http://creativecommons.org/licenses/by/2.0/");
+    /* ]]> */
 </script>
     </mt:if>
@@ -20,7 +22,7 @@
         <mt:if name="stat_url">
         <script type="text/javascript">
-        <!--
+        /* <![CDATA[ */
         commentsSlider.write(document);
-        // -->
+        /* ]]> */
         </script>
         <div class="stats-summary" id="stats-summary-comment">&nbsp;</div>
Index: /branches/release-29/tmpl/cms/restore_end.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/restore_end.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/restore_end.tmpl (revision 1309)
@@ -3,10 +3,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var progress = getByID("progress-bar");
 if (progress) {
     progress.style.display = "none";
 }
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/import.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/import.tmpl (revision 1253)
+++ /branches/release-29/tmpl/cms/import.tmpl (revision 1309)
@@ -8,5 +8,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var last_shown;
 function toggleDisplay(selection) {
@@ -36,5 +36,5 @@
     return openDialog(this.form, 'dialog_select_weblog', 'multi=0&amp;return_args=__mode%3Dstart_import');
 }
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_asset.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_asset.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_asset.tmpl (revision 1309)
@@ -22,5 +22,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function enableFilterButton() {
     getByID("filter-button").style.display = "inline";
@@ -66,5 +66,5 @@
 }
 TC.attachLoadEvent( init );
-// -->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/reload_opener.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/reload_opener.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/reload_opener.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <head>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var o = window.opener;
 if (o && o.location) {
@@ -9,5 +9,5 @@
     window.close();
 }
-// -->
+/* ]]> */
 </script>
 </head>
Index: /branches/release-29/tmpl/cms/upgrade_runner.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/upgrade_runner.tmpl (revision 1114)
+++ /branches/release-29/tmpl/cms/upgrade_runner.tmpl (revision 1309)
@@ -15,5 +15,5 @@
 
 	<script type="text/javascript">
-	<!--
+	/* <![CDATA[ */
     function upgradeDone(success) {
         var progress = getByID("progress-bar");
@@ -173,5 +173,5 @@
     }
     TC.attachLoadEvent( init );
-	//-->
+	/* ]]> */
 	</script>
 </mt:unless>
Index: /branches/release-29/tmpl/cms/cfg_archives.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_archives.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/cfg_archives.tmpl (revision 1309)
@@ -96,5 +96,5 @@
 <script type="text/javascript" src="<mt:var name="static_uri">js/tc/client.js"></script>
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function validate (f) {
     if (!f.site_path.value) {
@@ -184,5 +184,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/edit_asset.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_asset.tmpl (revision 1255)
+++ /branches/release-29/tmpl/cms/edit_asset.tmpl (revision 1309)
@@ -86,5 +86,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!-- 
+    /* <![CDATA[ */
     function validate(form) {    
         if (form.label.value.match(/\S/,''))
@@ -94,5 +94,5 @@
         return false;
     }
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/rebuilding.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/rebuilding.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/rebuilding.tmpl (revision 1309)
@@ -10,5 +10,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function doRedirect () {
 <mt:if name="redirect_target">
@@ -19,5 +19,5 @@
 }
 setTimeout('doRedirect()', 200);
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/upgrade.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/upgrade.tmpl (revision 1114)
+++ /branches/release-29/tmpl/cms/upgrade.tmpl (revision 1309)
@@ -16,4 +16,5 @@
 
 <script type="text/javascript">
+/* <![CDATA[ */
 function dismiss(id) {
     var el = getByID(id);
@@ -29,5 +30,5 @@
     }
 }
-
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/edit_blog.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_blog.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_blog.tmpl (revision 1309)
@@ -20,5 +20,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 var orig_site_url = "<mt:var name="site_url" _default="$suggested_site_url" escape="js">";
 var orig_site_path = "<mt:var name="site_path" _default="$suggested_site_path" escape="js">";
@@ -109,5 +109,5 @@
 TC.attachLoadEvent(init);
 
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/pinging.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/pinging.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/pinging.tmpl (revision 1309)
@@ -4,10 +4,10 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function doRedirect () {
     window.location.replace('<mt:var name="script_url">?__mode=ping&blog_id=<mt:var name="blog_id">&entry_id=<mt:var name="entry_id">&is_new=<mt:var name="is_new">&old_status=<mt:var name="old_status">&magic_token=<mt:var name="magic_token">');
 }
 setTimeout('doRedirect()', 1000);
-// -->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/cfg_prefs.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_prefs.tmpl (revision 1228)
+++ /branches/release-29/tmpl/cms/cfg_prefs.tmpl (revision 1309)
@@ -25,5 +25,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function doRemoveLicense () {
     document.cfg_form.cc_license.value = '';
@@ -50,5 +50,5 @@
    return false;
 }
-//-->
+/* ]]> */
 </script>
 
@@ -143,15 +143,10 @@
 <a href="javascript:void(0);" onclick="return setLicense();"><__trans phrase="Select a license"></a>
 </div>
-<mt:if name="cc_license">
 <script type="text/javascript">
-    var e = getByID('has-license');
+    /* <![CDATA[ */
+    var e = getByID(mt:if name="cc_license">'has-license'<mt:else>'no-license'</mt:if>);
     if (e) e.style.display = 'block';
+    /* ]]> */
 </script>
-<mt:else>
-<script type="text/javascript">
-    var e = getByID('no-license');
-    if (e) e.style.display = 'block';
-</script>
-</mt:if>
 <input type="hidden" name="cc_license" value="<mt:var name="cc_license" escape="html">" />
     </mtapp:setting>
Index: /branches/release-29/tmpl/cms/restore_start.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/restore_start.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/restore_start.tmpl (revision 1309)
@@ -7,8 +7,10 @@
 
 <script type="text/javascript">
+/* <![CDATA[ */
 function progress(str, id) {
     var el = getByID(id);
     if (el) el.innerHTML = str;
 }
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/list_folder.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_folder.tmpl (revision 1246)
+++ /branches/release-29/tmpl/cms/list_folder.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 // build array of each folder's id and the header id
 var categoryRows = new Array('0'<mt:loop name="category_loop">,'<mt:var name="category_id">'</mt:loop>);
@@ -128,5 +128,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_association.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_association.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_association.tmpl (revision 1309)
@@ -80,5 +80,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var tableSelect;
     function init() {
@@ -88,5 +88,5 @@
     }
     TC.attachLoadEvent( init );
-    // -->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_category.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_category.tmpl (revision 1246)
+++ /branches/release-29/tmpl/cms/list_category.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 // build array of each category's id and the header id
 var categoryRows = new Array('0'<mt:loop name="category_loop">,'<mt:var name="category_id">'</mt:loop>);
@@ -126,5 +126,5 @@
 
 TC.attachLoadEvent( init );
-//-->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/login.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/login.tmpl (revision 1098)
+++ /branches/release-29/tmpl/cms/login.tmpl (revision 1309)
@@ -4,5 +4,5 @@
 
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 // if this loads within our modal dialog iframe, force the user to
 // login from the 'top' of the browser.
@@ -26,5 +26,5 @@
 }
 TC.attachLoadEvent(init);
-//-->
+/* ]]> */
 </script>
 
Index: /branches/release-29/tmpl/cms/cfg_system_users.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/cfg_system_users.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/cfg_system_users.tmpl (revision 1309)
@@ -23,5 +23,5 @@
 <mt:setvarblock name="html_head" append="1">
 <script type="text/javascript">
-<!--
+/* <![CDATA[ */
 function clearWeblogCloneSource() {
     var el_name = getByID("new_user_template_blog_name");
@@ -69,5 +69,5 @@
     }
 }
--->
+/* ]]> */
 </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/list_author.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_author.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/list_author.tmpl (revision 1309)
@@ -91,5 +91,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function enableFilterButton() {
         getByID("filter-button").style.display = "inline";
@@ -137,5 +137,5 @@
 
     TC.attachLoadEvent( init );
-    // -->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/search_replace.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/search_replace.tmpl (revision 1162)
+++ /branches/release-29/tmpl/cms/search_replace.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <mt:setvarblock name="html_head" append="1">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     var tableSelect;
     function init()
@@ -127,5 +127,5 @@
     	}
     }
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>
Index: /branches/release-29/tmpl/cms/preview_strip.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/preview_strip.tmpl (revision 1230)
+++ /branches/release-29/tmpl/cms/preview_strip.tmpl (revision 1309)
@@ -49,4 +49,5 @@
 </mt:if>
     <script type="text/javascript">
+        /* <![CDATA[ */
         CMSScriptURI = '<$mt:var name="mt_url"$>';
         ScriptURI = '<$mt:var name="script_url"$>';
@@ -54,4 +55,5 @@
         StaticURI = '<$mt:var name="static_uri"$>';
         HelpBaseURI = '<$mt:var name="help_url"$>';
+        /* ]]> */
     </script>
 </mt:setvarblock>
@@ -112,7 +114,7 @@
 <mt:unless name="delayed_bootstrap">
 <script type="text/javascript">
-    // <![CDATA[
+    /* <![CDATA[ */
         App.bootstrapInline( false );
-    // ]]>
+    /* ]]> */
 </script>
 </mt:unless>
Index: /branches/release-29/tmpl/comment/login.tmpl
===================================================================
--- /branches/release-29/tmpl/comment/login.tmpl (revision 1104)
+++ /branches/release-29/tmpl/comment/login.tmpl (revision 1309)
@@ -2,5 +2,5 @@
 <mt:setvarblock name="html_head">
     <script type="text/javascript">
-    <!--
+    /* <![CDATA[ */
     function signinToggle(choice) {
         var auths = new Array(<mt:if name="enabled_MovableType">'mt',</mt:if><mt:loop name="auth_loop">'<mt:var name="name">'<mt:unless name="__last__">,</mt:unless></mt:loop>);
@@ -21,5 +21,5 @@
         }
     }
-    //-->
+    /* ]]> */
     </script>
 </mt:setvarblock>