3 files changed, 9 insertions, 5 deletions
diff --git a/admin/template/goto/plugins_new.tpl b/admin/template/goto/plugins_new.tpl
index 0d3f4e1ba..bd6339566 100644
--- a/admin/template/goto/plugins_new.tpl
+++ b/admin/template/goto/plugins_new.tpl
@@ -1,3 +1,4 @@
+{* $Id$ *}
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {known_script id="jquery.dimensions" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.dimensions.packed.js"}
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
@@ -35,8 +36,8 @@ jQuery().ready(function(){ldelim}
 </thead>
 {foreach from=$plugins item=plugin name=plugins_loop}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
-    <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC}">{$plugin.EXT_NAME}</a></td>
-    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC}">{$plugin.VERSION}</a></td>
+    <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
+    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.VER_DESC|htmlspecialchars|nl2br}">{$plugin.VERSION}</a></td>
     <td>{$plugin.DATE}</td>
     <td>{$plugin.AUTHOR}</td>
     <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a>
diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl
index c21e01e18..c7bdc2865 100644
--- a/admin/template/goto/plugins_update.tpl
+++ b/admin/template/goto/plugins_update.tpl
@@ -1,3 +1,4 @@
+{* $Id$ *}
 {known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
 {known_script id="jquery.dimensions" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.dimensions.packed.js"}
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
@@ -29,9 +30,9 @@ jQuery().ready(function(){ldelim}
 </thead>
 {foreach from=$plugins_not_uptodate item=plugin name=plugins_loop}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
-    <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC}">{$plugin.EXT_NAME}</a></td>
+    <td><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.EXT_NAME}</a></td>
     <td style="text-align:center;">{$plugin.VERSION}</td>
-    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC}">{$plugin.NEW_VERSION}</a></td>
+    <td style="text-align:center;"><a href="{$plugin.VERSION_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td>
     <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
       / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td>
   </tr>
@@ -52,7 +53,7 @@ jQuery().ready(function(){ldelim}
 </thead>
 {foreach from=$plugins_uptodate item=plugin name=plugins_loop}
   <tr class="{if $smarty.foreach.plugins_loop.index is odd}row1{else}row2{/if}">
-    <td><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.NAME}|{$plugin.EXT_DESC}">{$plugin.NAME}</a></td>
+    <td><a href="{$plugin.URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.NAME}|{$plugin.EXT_DESC|htmlspecialchars|nl2br}">{$plugin.NAME}</a></td>
     <td style="text-align:center;">{$plugin.VERSION}</td>
   </tr>
 {/foreach}
diff --git a/admin/template/goto/theme/roma/themeconf.inc.php b/admin/template/goto/theme/roma/themeconf.inc.php
index 556c685b3..27bfe7ec1 100644
--- a/admin/template/goto/theme/roma/themeconf.inc.php
+++ b/admin/template/goto/theme/roma/themeconf.inc.php
@@ -41,6 +41,8 @@ function selected_admin_menu()
       case 'maintenance':
       case 'advanced_feature':
       case 'plugins_list':
+      case 'plugins_update':
+      case 'plugins_new':
       case 'plugin':
         return 5;
     }