composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

De-hardcoded against the subdirectory "modules" (excepted the data model sources files)

Browse Source 
SVN:trunk[1779]
This commit is contained in:
Romain Quetiez
2012-01-17 15:31:51 +00:00
parent 851db98745
commit 39de3e9af7
9 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/metamodel.class.php
View File

@@ -738,10 +738,6 @@ abstract class MetaModel
final static public function GetAttributeDef($sClass, $sAttCode)
{
self::_check_subclass($sClass);
if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
{
echo "<p>$sAttCode is NOT a valid attribute of class $sClass.</p>";
}
return self::$m_aAttribDefs[$sClass][$sAttCode];
}
@@ -4033,6 +4029,8 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
public static function Startup($config, $bModelOnly = false, $bAllowCache = true, $bTraceSourceFiles = false)
{
define('MODULESROOT', APPROOT.'env-'.utils::GetCurrentEnvironment().'/');
self::$m_bTraceSourceFiles = $bTraceSourceFiles;
// $config can be either a filename, or a Configuration object (volatile!)
@@ -4615,6 +4613,10 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
*/
static public function ApplyParams($aInput, $aParams)
{
// Declare magic parameters
$aParams['APP_URL'] = utils::GetAbsoluteUrlAppRoot();
$aParams['MODULES_URL'] = utils::GetAbsoluteUrlModulesRoot();
$aSearches = array();
$aReplacements = array();
foreach($aParams as $sSearch => $replace)