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

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

Browse Source 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	core/config.class.inc.php
This commit is contained in:
Pierre Goiffon
2024-01-05 10:58:51 +01:00
parent 6042e7f74d a4f6f6e877
commit 48c4e2d13d
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/application/WebPage/AjaxPage.php
View File

@@ -57,6 +57,16 @@ class AjaxPage extends WebPage implements iTabbedPage
$oKpi->ComputeStats(get_class($this).' creation', 'AjaxPage');
}
/**
* Disabling sending the header so that resource won't be blocked by CORB. See parent method documentation.
* @return void
* @since 2.7.10 3.0.4 3.1.2 3.2.0 N°4368 method creation
*/
public function add_xcontent_type_options()
{
// Nothing to do !
}
/**
* @see static::$bOutputDataOnly
* @param bool $bFlag