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

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

Browse Source 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
This commit is contained in:
Pierre Goiffon
2020-10-05 16:12:49 +02:00
parent 5d7ae38adf 1f53757318
commit a765eb8725
15 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/run_query.php
View File

@@ -93,7 +93,6 @@ $oAppContext = new ApplicationContext();
$oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
$oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
$oP->add_header('X-Frame-Options: deny');
// Main program
$sExpression = utils::ReadParam('expression', '', false, 'raw_data');