Return-Path: 
 <commits-return-5255-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: (qmail 90331 invoked from network); 18 Jun 2008 01:39:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Jun 2008 01:39:49 -0000
Received: (qmail 32099 invoked by uid 500); 18 Jun 2008 01:39:51 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 32075 invoked by uid 500); 18 Jun 2008 01:39:51 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 32066 invoked by uid 99); 18 Jun 2008 01:39:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2008 18:39:51 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2008 01:39:10 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B526723889C2; Tue, 17 Jun 2008 18:39:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r669046 -
 /roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
Date: Wed, 18 Jun 2008 01:39:28 -0000
To: commits@roller.apache.org
From: snoopdave@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080618013928.B526723889C2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: snoopdave
Date: Tue Jun 17 18:39:28 2008
New Revision: 669046

URL: http://svn.apache.org/viewvc?rev=669046&view=rev
Log:
Applying patch for ROL-1726
https://issues.apache.org/roller/browse/ROL-1726

Fix for NPE when deleting subscription with ampersant in URL

Modified:
    roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp

Modified: roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=669046&r1=669045&r2=669046&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Tue Jun 17 18:39:28 2008
@@ -20,7 +20,7 @@
 <script type="text/javascript">
 function confirmSubDelete(subUrl) {
   if (window.confirm('Are you sure you want to remove this subscription?')) {
-    document.location.href='<s:url action="planetSubscriptions!delete" />?groupHandle=<s:property value="groupHandle"/>&subUrl='+subUrl;
+    document.location.href='<s:url action="planetSubscriptions!delete" />?groupHandle=<s:property value="groupHandle"/>&subUrl='+encodeURIComponent(subUrl);
   }
 }
 </script>