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

Small setup refactoring for getting ready for the Hub.

Browse Source 
SVN:trunk[5232]
This commit is contained in:
Denis Flaven
2018-01-10 15:47:15 +00:00
parent dcff39da25
commit 6544659251
6 changed files with 250 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/sqlobjectquery.class.inc.php
View File

@@ -547,7 +547,7 @@ class SQLObjectQuery extends SQLQuery
return $iRet;
}
protected function CollectUsedTables(&$aTables)
public function CollectUsedTables(&$aTables)
{
$this->m_oConditionExpr->CollectUsedParents($aTables);
foreach($this->m_aFields as $sFieldAlias => $oField)

2
core/userrights.class.inc.php
View File

@@ -1157,7 +1157,7 @@ class UserRights
self::$m_aAdmins = array();
self::$m_aPortalUsers = array();
}
if (!isset($_SESSION))
if (!isset($_SESSION) && !utils::IsModeCLI())
{
session_name('itop-'.md5(APPROOT));
session_start();