[mapserver-commits] r12065 - in trunk/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2011-08-17 09:02:11 -0700 (Wed, 17 Aug 2011)
New Revision: 12065

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php/web.c
Log:
PHP/Mapscript: Fixed webObj->metadata returns a webObj (#3971)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-08-16 16:31:11 UTC (rev 12064)
+++ trunk/mapserver/HISTORY.TXT	2011-08-17 16:02:11 UTC (rev 12065)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- PHP/Mapscript: Fixed webObj->metadata returns a webObj (#3971)
+
 - WCS 1.1: Added check for imageCRS in msOWSCommonBoundingBox() (#3966)
 
 - Fixed contains operator in logical expresions (#3974)

Modified: trunk/mapserver/mapscript/php/web.c
===================================================================
--- trunk/mapserver/mapscript/php/web.c	2011-08-16 16:31:11 UTC (rev 12064)
+++ trunk/mapserver/mapscript/php/web.c	2011-08-17 16:02:11 UTC (rev 12065)
@@ -88,7 +88,7 @@
     else IF_GET_STRING("legendformat", php_web->web->legendformat)
     else IF_GET_STRING("browseformat", php_web->web->browseformat)
     else IF_GET_OBJECT("extent", mapscript_ce_rect, php_web->extent, &php_web->web->extent)
-    else IF_GET_OBJECT("metadata", mapscript_ce_web, php_web->metadata, &php_web->web->metadata)
+    else IF_GET_OBJECT("metadata", mapscript_ce_hashtable, php_web->metadata, &php_web->web->metadata)
     else 
     {
         mapscript_throw_exception("Property '%s' does not exist in this object." TSRMLS_CC, property);