Author: nextgens
Date: 2008-04-23 06:02:58 +0000 (Wed, 23 Apr 2008)
New Revision: 19519
Modified:
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
improve last commit
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-04-23
05:53:16 UTC (rev 19518)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-04-23
06:02:58 UTC (rev 19519)
@@ -182,6 +182,7 @@
redirectToRoot(ctx);
return;
}
+ int validAlertsRemaining = 0;
UserAlert[] alerts = core.alerts.getAlerts();
for (int i = 0; i < alerts.length; i++) {
if (request.getIntPart("disable", -1) == alerts[i].hashCode())
{
@@ -195,9 +196,10 @@
Logger.normal(this, "Disabling the userAlert " +
alert.hashCode());
alert.isValid(false);
}
- }
+ } else if(alerts[i].isValid())
+ validAlertsRemaining++;
}
- writePermanentRedirect(ctx, l10n("disabledAlert"),
(core.alerts.getAlerts().length > 0 ? "/alerts/" : "/"));
+ writePermanentRedirect(ctx, l10n("disabledAlert"),
(validAlertsRemaining > 0 ? "/alerts/" : "/"));
return;
} else if (request.isPartSet("boardname") &&
(request.isPartSet("filename") || request.isPartSet("message"))) {
// Inserting into a frost board FIN