diff --git a/autoload.inc b/autoload.inc index 46927d3..a5e809b 100644 --- a/autoload.inc +++ b/autoload.inc @@ -8,11 +8,11 @@ require_once dirname(__FILE__).'/system/autoload.php'; //Autoload submodules require_once dirname(__FILE__).'/system/autoload.inc'; +require_once dirname(__FILE__).'/db/autoload.inc'; require_once dirname(__FILE__).'/log/autoload.inc'; require_once dirname(__FILE__).'/api/autoload.inc'; require_once dirname(__FILE__).'/page/autoload.inc'; require_once dirname(__FILE__).'/sql/autoload.inc'; -require_once dirname(__FILE__).'/db/autoload.inc'; require_once dirname(__FILE__).'/security/autoload.inc'; require_once dirname(__FILE__).'/config/autoload.inc'; require_once dirname(__FILE__).'/cache/autoload.inc'; diff --git a/db/qq/QI.php b/db/qq/QI.php index 668fc7c..bba9d16 100644 --- a/db/qq/QI.php +++ b/db/qq/QI.php @@ -24,7 +24,8 @@ class QI { ' --execute="SOURCE '; $result = array(); foreach($files as $file){ - $result[] = shell_exec($command .$file. '"');} - return \SYSTEM\LOG\JsonResult::toString($result); + $output = shell_exec($command .$file. '"'); + $result[] = array($file,$output);} + return $result; } } \ No newline at end of file diff --git a/sql/autoload.inc b/sql/autoload.inc index 774ace9..c5a0b89 100644 --- a/sql/autoload.inc +++ b/sql/autoload.inc @@ -1,4 +1,23 @@