diff --git a/.htaccess b/.htaccess
index 0980b6d0f..597e5df18 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,13 +1,13 @@
RewriteEngine On
# reserve XE Layout Template Source File (*.html)
-RewriteRule ^layouts/(.+)/(.+)\.html$ ./index.php [L]
+RewriteRule ^(layouts|m.layouts)/(.+)/(.+)\.html$ ./index.php [L]
# static files
RewriteCond %{SCRIPT_FILENAME} !-f
RewriteRule ^(.+)/files/(member_extra_info|attach|cache|faceOff)/(.*) ./files/$2/$3 [L]
RewriteCond %{SCRIPT_FILENAME} !-f
-RewriteRule ^(.+)/(files|modules|common|widgets|widgetStyle|layouts|addons)/(.*) ./$2/$3 [L]
+RewriteRule ^(.+)/(files|modules|common|widgets|widgetStyle|layouts|m.layouts|addons)/(.*) ./$2/$3 [L]
# rss , blogAPI
RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L]
diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php
index 447d377fa..4d50066ed 100644
--- a/addons/resize_image/resize_image.addon.php
+++ b/addons/resize_image/resize_image.addon.php
@@ -11,4 +11,4 @@
Context::loadJavascriptPlugin('ui');
Context::addJsFile('./addons/resize_image/js/resize_image.min.js',false);
}
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index d16299c1f..83ea54b2a 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -309,7 +309,7 @@
if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid');
if($source_args) $args = @clone($source_args);
-
+$this->source_args = $args;
$output = @include($cache_file);
if( (is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index becc57b62..edb6f91fe 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -187,13 +187,18 @@
// 쿼리 문 실행
$result = @cubrid_execute ($this->fd, $query);
- //if(!$result){ debugPrint('result null: ' .$query); }
+ if(!$result){
+
+ debugPrint('result null: ' .$query);
+ debugPrint($this->source_args);
+ }
// 오류 체크
if (cubrid_error_code ()) {
$code = cubrid_error_code ();
$msg = cubrid_error_msg ();
- //debugPrint('query error : '. $code.', msg:'. $msg .', ' .$query);
+ debugPrint('query error : '. $code.', msg:'. $msg .', ' .$query);
+ debugPrint($this->source_args);
$this->setError ($code, $msg);
}
diff --git a/config/func.inc.php b/config/func.inc.php
index aca4c6120..1c0f86e64 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -488,7 +488,7 @@
* ./files/_debug_message.php 파일에 $buff 내용을 출력한다.
* tail -f ./files/_debug_message.php 하여 계속 살펴 볼 수 있다
**/
- function debugPrint($debug_output = null, $display_option = true) {
+ function debugPrint($debug_output = null, $display_option = true, $file = '_debug_message.php') {
if(!(__DEBUG__ & 1)) return;
static $firephp;
@@ -523,7 +523,7 @@
if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
return;
}
- $debug_file = _XE_PATH_.'files/_debug_message.php';
+ $debug_file = _XE_PATH_.'files/'.$file;
if(function_exists("memory_get_usage"))
{
$debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, true));
diff --git a/index.php b/index.php
index b25112558..7ac393629 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,7 @@
-
+