fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 16:22:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Moved call to getDBParser from XmlQueryParser.class.php to DB.class.php - because otherwise the XmlQueryParser would have been included even when it was not needed.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9139 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-09 15:05:29 +00:00
parent b012937719
commit e1bf4523c7
15 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/db/DB.class.php
View file

@ -21,7 +21,6 @@
require(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php');
require(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');
require(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php');
require(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php');
@ -76,7 +75,7 @@
var $cache_file = 'files/cache/queries/'; ///< location of query cache
var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
/**
* @brief returns instance of certain db type
* @param[in] $db_type type of db

2
classes/db/queryparts/Query.class.php
View file

@ -51,7 +51,7 @@
$this->columnList = $columnList;
if(count($this->columnList) > 0) {
$selectColumns = array();
$dbParser = XmlQueryParser::getDBParser();
$dbParser = DB::getParser();
foreach($this->columnList as $columnName){
$columnName = $dbParser->escapeColumn($columnName);