diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 5516af836..b81b13442 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -785,6 +785,12 @@ class adminProxy extends HttpProxyController $width = "100%"; $upload = new ReplacementLogo(); $aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']); + if (!is_array($aPhotoSelect)) { + $aPhotoSelect = []; + } + if (!isset($aPhotoSelect['DEFAULT_LOGO_NAME'])) { + $aPhotoSelect['DEFAULT_LOGO_NAME'] = ''; + } $sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']); $check = ''; $ainfoSite = explode("/", $_SERVER["REQUEST_URI"]); diff --git a/workflow/engine/controllers/pmTables.php b/workflow/engine/controllers/pmTables.php index 06607a2de..f006f8b8a 100644 --- a/workflow/engine/controllers/pmTables.php +++ b/workflow/engine/controllers/pmTables.php @@ -94,10 +94,10 @@ class pmTables extends Controller if ($table['ADD_TAB_TYPE'] == 'NORMAL' || $table['ADD_TAB_TYPE'] == 'GRID') { $repTabPluginPermissions = $this->_getSimpleReportPluginDef(); } - } - if (preg_match("/^PMT_(.*)$/", $table['ADD_TAB_NAME'], $match)) { - $table['ADD_TAB_NAME'] = $match[1]; + if (preg_match("/^PMT_(.*)$/", $table['ADD_TAB_NAME'], $match)) { + $table['ADD_TAB_NAME'] = $match[1]; + } } $this->includeExtJS( 'pmTables/' . $jsFile );