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

Fix broken export

Browse Source 
Argument 1 passed to Combodo\iTop\Controller\AjaxRenderController::ExportBuild() must be an instance of Combodo\iTop\Controller\ajax_page, instance of AjaxPage given,

Caused by merge of support/2.7 with 2 conflicts on the same line (347cbca5)
This commit is contained in:
Pierre Goiffon
2021-10-21 17:03:36 +02:00
parent 54db7243bf
commit 59d674d744
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Controller/AjaxRenderController.php
View File

@@ -105,12 +105,11 @@ class AjaxRenderController
/**
* @param \AjaxPage $oPage
*
* @param bool $bTokenOnly
*
* @throws \Exception
*/
public static function ExportBuild(ajax_page $oPage, $bTokenOnly)
public static function ExportBuild(AjaxPage $oPage, $bTokenOnly)
{
register_shutdown_function(function () {
$aErr = error_get_last();