Subversion Repositories Applications.framework

Rev

Rev 388 | Rev 395 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 388 Rev 390
Line 10... Line 10...
10
 * @package	Framework
10
 * @package	Framework
11
 * @author		Jean-Pascal MILCENT <jpm@tela-botanica.org>
11
 * @author		Jean-Pascal MILCENT <jpm@tela-botanica.org>
12
 * @copyright	Copyright (c) 2009, Tela Botanica (accueil@tela-botanica.org)
12
 * @copyright	Copyright (c) 2009, Tela Botanica (accueil@tela-botanica.org)
13
 * @license	http://www.gnu.org/licenses/gpl.html Licence GNU-GPL-v3
13
 * @license	http://www.gnu.org/licenses/gpl.html Licence GNU-GPL-v3
14
 * @license	http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL-v2
14
 * @license	http://www.cecill.info/licences/Licence_CeCILL_V2-fr.txt Licence CECILL-v2
15
 * @version	$Id: Config.php 388 2011-10-31 15:39:05Z jpm $
15
 * @version	$Id: Config.php 390 2011-11-09 13:06:50Z jpm $
16
 * @link		/doc/framework/
16
 * @link		/doc/framework/
17
 */
17
 */
Line 18... Line 18...
18
 
18
 
Line 167... Line 167...
167
			} else {
167
			} else {
168
				self::evaluerReferences($config, $cle);
168
				self::evaluerReferences($config, $cle);
169
				self::evaluerPhp($config, $cle);
169
				self::evaluerPhp($config, $cle);
170
				self::evaluerCle($config, $cle, $config[$cle]);
170
				self::evaluerCle($config, $cle, $config[$cle]);
171
			}
171
			}
172
			self::fusionner($ini);
172
			self::fusionner($config);
173
		}
173
		}
174
		return $config;
174
		return $config;
175
	}
175
	}
Line 176... Line 176...
176
 
176