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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Molkobain
2022-01-27 16:09:22 +01:00
parent 44c18395b3 b89d181125
commit 3bec96abe1
102 changed files with 986 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -51,7 +51,7 @@ abstract class Controller
private $m_sOperation;
/** @var string */
private $m_sModule;
/** @var iTopWebPage|\ajax_page */
/** @var iTopWebPage|\AjaxPage */
private $m_oPage;
/** @var bool */
private $m_bCheckDemoMode = false;
@@ -332,7 +332,7 @@ abstract class Controller
}
/**
* Display an AJAX page (ajax_page)
* Display an AJAX page (AjaxPage)
*
* @api
*
@@ -347,7 +347,7 @@ abstract class Controller
}
/**
* Display an AJAX page (ajax_page)
* Display an AJAX page (AjaxPage)
*
* @api
*