@@ 357-359 (lines=3) @@ | ||
354 | $properties = $modx->parseProperties($row['properties']); |
|
355 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
|
356 | $properties = array_merge($sharedproperties, $properties); |
|
357 | if (0 < count($properties)) { |
|
358 | $content .= '$s[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
359 | } |
|
360 | } |
|
361 | } |
|
362 | ||
@@ 381-383 (lines=3) @@ | ||
378 | $properties = $modx->parseProperties($row['properties']); |
|
379 | $sharedproperties = $modx->parseProperties($row['sharedproperties']); |
|
380 | $properties = array_merge($sharedproperties, $properties); |
|
381 | if (0 < count($properties)) { |
|
382 | $content .= '$p[\'' . $key . 'Props\']=\'' . $this->escapeSingleQuotes(json_encode($properties)) . '\';'; |
|
383 | } |
|
384 | } |
|
385 | } |
|
386 |