[mapserver-commits] r9381 - in trunk/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-06 08:41:34 -0400 (Tue, 06 Oct 2009)
New Revision: 9381

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php3/mapscript_i.c
Log:
Fixed TEXT property cannot be removed in the CLASS object. PHP/Mapscript (#3063)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-05 19:37:31 UTC (rev 9380)
+++ trunk/mapserver/HISTORY.TXT	2009-10-06 12:41:34 UTC (rev 9381)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed TEXT property cannot be removed in the CLASS object. PHP/Mapscript (#3063)
+
 - Fixed use of minfeaturesize auto with curved labels (#3151)
 
 - Fixed msRemoveHashTable function when 2 keys have the same hash (#3146)

Modified: trunk/mapserver/mapscript/php3/mapscript_i.c
===================================================================
--- trunk/mapserver/mapscript/php3/mapscript_i.c	2009-10-05 19:37:31 UTC (rev 9380)
+++ trunk/mapserver/mapscript/php3/mapscript_i.c	2009-10-06 12:41:34 UTC (rev 9381)
@@ -798,6 +798,10 @@
 }
 
 int classObj_setText(classObj *self, layerObj *layer, char *string) {
+    if (!string || strlen(string) == 0) {
+        freeExpression(&self->text);
+        return MS_SUCCESS;
+    }
     return msLoadExpressionString(&self->text, string);
 }