1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 13:21:54 +02:00

Fixes batch process issue under PHP 7.3

This commit is contained in:
Cameron
2019-03-03 13:08:02 -08:00
parent 4e07b87e37
commit 037c7c67ff
2 changed files with 15 additions and 4 deletions

View File

@@ -3093,7 +3093,7 @@ class e_admin_controller_ui extends e_admin_controller
$tree->setTree($arr,true); // set the newly ordered tree.
var_dump($arr);
// var_dump($arr);
return $this->_tree_model;
}
@@ -3307,15 +3307,16 @@ class e_admin_controller_ui extends e_admin_controller
return $this;
}
}
if($selected)
{
foreach ($selected as $i => $_sel)
{
$selected[$i] = preg_replace('/[^\w-:.]/', '', $_sel);
$selected[$i] = (int) $_sel; // preg_replace('/[^\w-:.]/', '', $_sel); // php 7.3 doesn't like this.
}
}
if(substr($batch_trigger, 0, 6) === 'batch_')
{
list($tmp,$plugin,$command) = explode("_",$batch_trigger,3);
@@ -3471,7 +3472,8 @@ class e_admin_controller_ui extends e_admin_controller
$this->handleCommaBatch($selected, $field, array_keys($classes), $trigger[0] === 'ucdelall' ? 'clearAll' : 'addAll');
}
break;
// handleListCopyBatch etc.
default:
$field = $trigger[0];
$value = $trigger[1];