forked from I2P_Developers/i2p.i2p
Fixed bugs introduced while reverting
This commit is contained in:
@@ -301,12 +301,12 @@ public class SnarkManager implements Snark.CompleteListener {
|
|||||||
boolean universalTheming = _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
|
boolean universalTheming = _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
|
||||||
if (universalTheming) {
|
if (universalTheming) {
|
||||||
// Fetch routerconsole theme (or use our default if it doesn't exist)
|
// Fetch routerconsole theme (or use our default if it doesn't exist)
|
||||||
theme = _context.getProperty(RC_PROP_THEME_NAME, DEFAULT_THEME);
|
theme = _context.getProperty(RC_PROP_THEME, DEFAULT_THEME);
|
||||||
// Ensure that theme exists
|
// Ensure that theme exists
|
||||||
String[] themes = getThemes();
|
String[] themes = getThemes();
|
||||||
boolean themeExists = false;
|
boolean themeExists = false;
|
||||||
for (int i = 0; i < themes.length; i++) {
|
for (int i = 0; i < themes.length; i++) {
|
||||||
if (themes[i].equals(_theme))
|
if (themes[i].equals(theme))
|
||||||
themeExists = true;
|
themeExists = true;
|
||||||
}
|
}
|
||||||
if (!themeExists) {
|
if (!themeExists) {
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
package i2p.susi.dns;
|
package i2p.susi.dns;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileFilter;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
@@ -1198,7 +1198,7 @@ public class WebMail extends HttpServlet
|
|||||||
boolean universalTheming = ctx.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
|
boolean universalTheming = ctx.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
|
||||||
if (universalTheming) {
|
if (universalTheming) {
|
||||||
// Fetch routerconsole theme (or use our default if it doesn't exist)
|
// Fetch routerconsole theme (or use our default if it doesn't exist)
|
||||||
theme = ctx.getProperty(RC_PROP_THEME_NAME, DEFAULT_THEME);
|
theme = ctx.getProperty(RC_PROP_THEME, DEFAULT_THEME);
|
||||||
// Ensure that theme exists
|
// Ensure that theme exists
|
||||||
String[] themes = getThemes();
|
String[] themes = getThemes();
|
||||||
boolean themeExists = false;
|
boolean themeExists = false;
|
||||||
|
Reference in New Issue
Block a user