Index: /branches/comu-ver2/data/class/pages/error/LC_Page_Error_SystemError.php
===================================================================
--- /branches/comu-ver2/data/class/pages/error/LC_Page_Error_SystemError.php	(revision 18282)
+++ /branches/comu-ver2/data/class/pages/error/LC_Page_Error_SystemError.php	(revision 18291)
@@ -35,7 +35,4 @@
 class LC_Page_Error_SystemError extends LC_Page_Error {
     
-    /** ソースコード */
-    var $sourceCode;
-    
     /** PEAR_Error */
     var $pearResult;
@@ -43,4 +40,7 @@
     /** PEAR_Error がセットされていない場合用のバックトレーススタック */
     var $backtrace;
+
+    /** デバッグ用のメッセージ配列 */
+    var $arrDebugMsg = array();
 
     // }}}
@@ -127,7 +127,8 @@
         $errmsg .= "\n";
         
-        // エラーとなったソースコードが明示的に指定されている場合
-        if (!is_null($this->sourceCode)) {
-            $errmsg .= $this->sourceCode . "\n";
+        // デバッグ用のメッセージが指定されている場合
+        if (!empty($this->arrDebugMsg)) {
+            $errmsg .= implode("\n\n", $this->arrDebugMsg) . "\n";
+            $errmsg .= "\n";
         }
         
@@ -159,10 +160,19 @@
         $errmsg .= SC_Utils_Ex::sfGetUrl() . "\n";
         $errmsg .= "\n";
-        $errmsg .= "SERVER_ADDR:" . $_SERVER['SERVER_ADDR'] . "\n";
-        $errmsg .= "REMOTE_ADDR:" . $_SERVER['REMOTE_ADDR'] . "\n";
-        $errmsg .= "USER_AGENT:" . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $errmsg .= "SERVER_ADDR: " . $_SERVER['SERVER_ADDR'] . "\n";
+        $errmsg .= "REMOTE_ADDR: " . $_SERVER['REMOTE_ADDR'] . "\n";
+        $errmsg .= "USER_AGENT: " . $_SERVER['HTTP_USER_AGENT'] . "\n";
         
         return $errmsg;
     }
+
+    /**
+     * デバッグ用のメッセージを追加
+     *
+     * @return void
+     */
+    function addDebugMsg($debugMsg) {
+        $this->arrDebugMsg[] = rtrim($debugMsg, "\n");
+    }
 }
 ?>
Index: /branches/comu-ver2/data/class/SC_DbConn.php
===================================================================
--- /branches/comu-ver2/data/class/SC_DbConn.php	(revision 18286)
+++ /branches/comu-ver2/data/class/SC_DbConn.php	(revision 18291)
@@ -59,9 +59,9 @@
                 }
             }
-        }
-        
-        if (DB_TYPE == 'mysql') {
-            $objDbConn->query('SET NAMES utf8');
-        }
+            }
+            
+            if (DB_TYPE == 'mysql') {
+                $objDbConn->query('SET NAMES utf8');
+            }
         
         $this->conn = $objDbConn;
@@ -218,5 +218,5 @@
         register_shutdown_function(array($objPage, "destroy"));
         $objPage->init();
-        $objPage->sourceCode = $sql;
+        $objPage->addDebugMsg($sql);
         $objPage->pearResult = $pearResult;
         GC_Utils_Ex::gfPrintLog($objPage->sfGetErrMsg());