Subversion Repositories Applications.framework

Compare Revisions

Regard whitespace Rev 387 → Rev 388

/branches/v0.3-aleaume/framework/Config.php
93,7 → 93,6
if (file_exists($fichier_ini)) {
$ini = parse_ini_file($fichier_ini, true);
$ini = self::analyserTableauIni($ini);
self::fusionner($ini);
$retour = true;
}
return $retour;
170,6 → 169,7
self::evaluerPhp($config, $cle);
self::evaluerCle($config, $cle, $config[$cle]);
}
self::fusionner($config);
}
return $config;
}
211,7 → 211,7
private static function evaluerReferences(&$config, $cle) {
if (preg_match_all('/{ref:([A-Za-z0-9_.-]+)}/', $config[$cle], $correspondances, PREG_SET_ORDER)) {
foreach ($correspondances as $ref) {
$config[$cle] = str_replace($ref[0], self::getValeur($ref[1], $config), $config[$cle]);
$config[$cle] = str_replace($ref[0], self::getValeur($ref[1], self::$parametres), $config[$cle]);
}
}
}