@@ 363-365 (lines=3) @@ | ||
360 | $properties = $modx->parseProperties($row['properties']); |
|
361 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
|
362 | $properties = array_merge($sharedproperties, $properties); |
|
363 | if (0 < count($properties)) { |
|
364 | $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
365 | } |
|
366 | } |
|
367 | } |
|
368 | ||
@@ 387-389 (lines=3) @@ | ||
384 | $properties = $modx->parseProperties($row['properties']); |
|
385 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
|
386 | $properties = array_merge($sharedproperties, $properties); |
|
387 | if (0 < count($properties)) { |
|
388 | $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
389 | } |
|
390 | } |
|
391 | } |
|
392 |