extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from asig2016/for_each

Browse Source 
Fixed, PHP Warning: Invalid argument supplied for foreach() in ...
This commit is contained in:
Ralf Becker 2019-03-05 09:04:19 +01:00 committed by GitHub
commit a154557512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/Db/Schema.php
View File

@ -165,16 +165,22 @@ class Schema
$columns = implode('-',$columns);
if ($ignore_length_limit) $columns = preg_replace('/\(\d+\)/', '', $columns);
}
foreach($indexs as $index)
{
if (is_array($index))
if(is_array($indexs)){
foreach($indexs as $index)
{
unset($index['options']);
$index = implode('-',$index);
if (is_array($index))
{
unset($index['options']);
$index = implode('-',$index);
}
if ($ignore_length_limit) $index = preg_replace('/\(\d+\)/', '', $index);
if ($columns == $index) return true;
}
if ($ignore_length_limit) $index = preg_replace('/\(\d+\)/', '', $index);
if ($columns == $index) return true;
}
return false;
}

13
importexport/inc/class.importexport_definition.inc.php
View File

@ -180,11 +180,16 @@ class importexport_definition implements importexport_iface_egw_record {
*/
private function set_options(array $_plugin_options) {
// Check conditions
foreach ( $_plugin_options['conditions'] as $key => $condition ) {
if(!$condition['string'])
{
unset($_plugin_options['conditions'][$key]);
if (is_array($_plugin_options['conditions'] )){
foreach ( $_plugin_options['conditions'] as $key => $condition ) {
if(!$condition['string'])
{
unset($_plugin_options['conditions'][$key]);
}
}
}
$this->definition['plugin_options'] = $_plugin_options;
}