update main with develop #48

Zusammengeführt
Oldperl hat 218 Commits von develop nach main 2023-10-16 16:14:01 +00:00 zusammengeführt
2 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
Nur Änderungen aus Commit b409ba0915 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -144,10 +144,11 @@ class pimPluginHandler {
$aGeneral = array(); $aGeneral = array();
if (is_object($this->_oPiXml)) { if (is_object($this->_oPiXml)) {
$aGeneral = $this->_xml2Array($this->_oPiXml->general); $aGeneral = $this->_xml2Array($this->_oPiXml->general);
$aGeneral['dependencies'] = print_r($aDependencies, TRUE); $aDependencies = $this->_xml2Array($this->_oPiXml->dependencies);
$aGeneral['dependencies'] = $aDependencies;
} }
//print_r($aGeneral); return $aGeneral;
//return $aGeneral;
} }
/** /**

Datei anzeigen

@ -161,8 +161,8 @@ if (is_dir($cfg['path']['plugins'])) {
$aNeededTplVar['writeable'] = ($bPiPathWritable)?i18n("Everything looks fine.", "pluginmanager"):'<span style="color:red;">' $aNeededTplVar['writeable'] = ($bPiPathWritable)?i18n("Everything looks fine.", "pluginmanager"):'<span style="color:red;">'
.i18n("Pluginfolder not writable!", "pluginmanager").'</span>'; .i18n("Pluginfolder not writable!", "pluginmanager").'</span>';
$aInfoGeneral = array_merge($aNeededTplVar, $oPluginHandler->getPiGeneralArray()); $aInfoGeneral = array_merge($aNeededTplVar, $oPluginHandler->getPiGeneralArray());
echo "<pre>"; //echo "<pre>";
print_r($aInfoGeneral); //print_r($aInfoGeneral);
// initalization new template class // initalization new template class
$oView2 = new pimView(); $oView2 = new pimView();