Skip to content

Commit 92a15c0

Browse files
committed
[fix] for php7: ddmultiplefields.php http://modx.im/blog/addons/4265.html#comment44232
1 parent a97b1b5 commit 92a15c0

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

assets/plugins/managermanager/widgets/ddmultiplefields/ddmultiplefields.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
* @copyright 2014, DivanDesign
3131
* http://www.DivanDesign.biz
3232
*/
33-
33+
function isJson($string) {
34+
json_decode($string);
35+
return (json_last_error() == JSON_ERROR_NONE);
36+
}
3437
function mm_ddMultipleFields($tvs = '', $roles = '', $templates = '', $columns = 'field', $columnsTitle = '', $colWidth = '180', $splY = '||', $splX = '::', $imgW = 300, $imgH = 100, $minRow = 0, $maxRow = 0, $columnsData = '',$options = array()){
3538
if (!useThisRule($roles, $templates)){return;}
3639
if (is_array($options)) {
@@ -62,15 +65,7 @@ function mm_ddMultipleFields($tvs = '', $roles = '', $templates = '', $columns =
6265
$columnsData = array();
6366

6467
foreach ($columnsDataTemp as $value){
65-
//Евалим знение и записываем результат или исходное значени
66-
try {
67-
$eval = eval($value);
68-
} catch (Throwable $t) {
69-
echo $t->getMessage(), "\n";
70-
} catch (Exception $e) {
71-
echo $e->getMessage(), "\n";
72-
}
73-
$columnsData[] = $eval ? addslashes(json_encode($eval)) : addslashes($value);
68+
$columnsData[] = addslashes(!isJson($value) ? json_encode($value) : $value);
7469
}
7570
//Сливаем в строку, что бы передать на клиент
7671
$columnsData = implode('||', $columnsData);

0 commit comments

Comments
 (0)