Refactor $modx->parseProperties()

#494
modxcms · Mar 4, 2016 · e0ffb3e · MrSwed · May 16, 2016 · e0ffb3e
1 parent 3b2af67
commit e0ffb3e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/manager/includes/document.parser.class.inc.php b/manager/includes/document.parser.class.inc.php
@@ -3822,10 +3822,12 @@ function invokeEvent($evtName, $extParams= array ()) {
      */
     function parseProperties($propertyString, $elementName = null, $elementType = null) {
 
-        $property = array();
+        $propertyString = trim($propertyString);
+        $token = substr($propertyString,0,1);
 
-        if (!empty ($propertyString)) {
+        if ($token=='&') {
             $props= explode('&', $propertyString);
+            $property = array();
             foreach ($props as $prop) {
 
                 if (strpos($prop, '=')===false) {
@@ -3843,6 +3845,9 @@ function parseProperties($propertyString, $elementName = null, $elementType = nu
                 $property[$key] = $value;
             }
         }
+//      elseif($token=='[' || $token=='{') {
+//          $property = json_decode($propertyString, true);
+//      }
         else $property = array();
 
         if(!empty($elementName) && !empty($elementType)){