From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 22 Oct 2004 16:14:58 +0000 (+0000)
Subject: bugfix
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=877e2286892467343655bb41f6fa95b84aef32e8;p=sope

bugfix

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@309 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index d7499733..a56a7aec 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* WOElement.m: fixed unwanted behaviour introduced in v4.3.72 (v4.3.73)
+
 	* WOElement.m: queryParameters override keys from queryDictionary in
 	  case of conflicts (v4.3.72)
 
diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
index 81e7cc55..7e725fb2 100644
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj
@@ -820,7 +820,7 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 4.3.72;
+				DYLIB_CURRENT_VERSION = 4.3.73;
 				FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				FRAMEWORK_VERSION = A;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 89a1946d..694d1b5c 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=72
+SUBMINOR_VERSION:=73
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115
diff --git a/sope-appserver/NGObjWeb/WOElement.m b/sope-appserver/NGObjWeb/WOElement.m
index bae906c8..47c1e046 100644
--- a/sope-appserver/NGObjWeb/WOElement.m
+++ b/sope-appserver/NGObjWeb/WOElement.m
@@ -193,17 +193,19 @@ static id numStrings[100];
   }
   
   keys = [_queryDict keyEnumerator];
-  while ((key = [keys nextObject]) && (![paraKeys containsObject:key])) {
-    value = [[_queryDict objectForKey:key] stringValue];
-    value = value ? [value stringByEscapingURL] : @"";
-    key   = key   ? [key   stringByEscapingURL] : @"";
-
-    if (isFirst) isFirst = NO;
-    else [str appendString:@"&"];
-
-    [str appendString:key];
-    [str appendString:@"="];
-    [str appendString:value];
+  while ((key = [keys nextObject])) {
+    if(![paraKeys containsObject:key]) {
+      value = [[_queryDict objectForKey:key] stringValue];
+      value = value ? [value stringByEscapingURL] : @"";
+      key   = key   ? [key   stringByEscapingURL] : @"";
+      
+      if (isFirst) isFirst = NO;
+      else [str appendString:@"&"];
+      
+      [str appendString:key];
+      [str appendString:@"="];
+      [str appendString:value];
+    }
   }
   
   return [str length] > 0 ? str : nil;