[Mapbender-commits] r5394 - trunk/mapbender/http/print/classes

[svn_mapbender at osgeo.org]

Author: mschulz
Date: 2010-01-21 07:23:26 -0500 (Thu, 21 Jan 2010)
New Revision: 5394

Modified:
   trunk/mapbender/http/print/classes/mbTextDecorator.php
Log:
Values of special text types date and scale values are no longer overridden.

Modified: trunk/mapbender/http/print/classes/mbTextDecorator.php
===================================================================
--- trunk/mapbender/http/print/classes/mbTextDecorator.php	2010-01-21 12:20:10 UTC (rev 5393)
+++ trunk/mapbender/http/print/classes/mbTextDecorator.php	2010-01-21 12:23:26 UTC (rev 5394)
@@ -37,18 +37,15 @@
 					break;
 				default:
 					$this->{$overrideMemberFromRequest} = $this->conf->{$overrideMemberFromRequest};
+					foreach ($idsFromRequest as $requestKey => $memberId) {
+						$e = new mb_notice("mbTextDecorator: before override: set ".$memberId." to ".$requestKey);
+						if ($overrideMemberFromRequest==$memberId && isset($_REQUEST[$requestKey]) && $_REQUEST[$requestKey] != "") { 
+							$this->{$overrideMemberFromRequest} = $_REQUEST[$requestKey];
+							$e = new mb_notice("mbTextDecorator: override from Request: ".$overrideMemberFromRequest." to ".$this->{$overrideMemberFromRequest});
+						}
+					}	
 					break;
 			}
-			foreach ($idsFromRequest as $requestKey => $memberId) {
-				$e = new mb_notice("mbTextDecorator: before override: set ".$memberId." to ".$requestKey);
-				if ($overrideMemberFromRequest==$memberId && isset($_REQUEST[$requestKey]) && $_REQUEST[$requestKey] != "") { 
-					$this->{$overrideMemberFromRequest} = $_REQUEST[$requestKey];
-					$e = new mb_notice("mbTextDecorator: override from Request: ".$overrideMemberFromRequest." to ".$this->{$overrideMemberFromRequest});
-				}
-				else {
-					$this->{$overrideMemberFromRequest} = $this->conf->{$memberId};
-				}	
-			}	
 		}
 	}