Fixed overriding sidebar items (JM-224).

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1175 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/admin/AdminConsole.java

@@ -328,7 +328,7 @@ public class AdminConsole {
         // Override entries.
         for (Iterator i=overrideSidebar.elementIterator(); i.hasNext(); ) {
             Element entry = (Element)i.next();
-            String id = sidebar.attributeValue("id");
+            String id = entry.attributeValue("id");
             Element existingEntry = getElemnetByID(id);
             // Simple case, there is no existing sidebar with the same id.
             if (existingEntry == null) {

src/java/org/jivesoftware/admin/SidebarTag.java

@@ -312,7 +312,10 @@ public class SidebarTag extends BodyTagSupport {
         return (in == null ? "" : StringUtils.replace(in, "'", "\\'"));
     }
 
-    private String i18n(String in) {
+    private static String i18n(String in) {
+        if (in == null) {
+            return null;
+        }
         // Look for the key symbol:
         if (in.indexOf("${") == 0 && in.indexOf("}") == in.length()-1) {
             return LocaleUtils.getLocalizedString(in.substring(2, in.length()-1));