(Retrofit from trunk) N.609 Some multi-column UNION queries failing with various symptoms such as "Class 'IT Department' not found" or "An object id must be an integer value"

SVN:2.3[4635]

core/sqlobjectquery.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2015-2016 Combodo SARL
+// Copyright (C) 2015-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -21,7 +21,7 @@
  * SQLObjectQuery
  * build a mySQL compatible SQL query
  *
- * @copyright   Copyright (C) 2015-2016 Combodo SARL
+ * @copyright   Copyright (C) 2015-2017 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -138,6 +138,11 @@ class SQLObjectQuery extends SQLQuery
 		$this->m_aFields = $aExpressions;
 	}
 
+	public function SortSelectedFields()
+	{
+		ksort($this->m_aFields);
+	}
+
 	public function AddSelect($sAlias, $oExpression)
 	{
 		$this->m_aFields[$sAlias] = $oExpression;