Index: /branches/version-2_13-dev/.travis.yml
===================================================================
--- /branches/version-2_13-dev/.travis.yml	(revision 23376)
+++ /branches/version-2_13-dev/.travis.yml	(revision 23588)
@@ -15,7 +15,5 @@
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev --no-interaction
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE myapp_test;'; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database myapp_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
   - cp tests/require.php.jenkins tests/require.php
Index: /branches/version-2_13-dev/tests/class/Common_TestCase.php
===================================================================
--- /branches/version-2_13-dev/tests/class/Common_TestCase.php	(revision 23539)
+++ /branches/version-2_13-dev/tests/class/Common_TestCase.php	(revision 23588)
@@ -29,6 +29,6 @@
     protected function setUp()
     {
-      $this->objQuery = SC_Query_Ex::getSingletonInstance('', true);
-      $this->objQuery->begin();
+        $this->objQuery = SC_Query_Ex::getSingletonInstance('', true);
+        $this->objQuery->begin();
     }
 
@@ -65,5 +65,5 @@
         $this->verify('exitしたかどうか');
     }
-    */
+     */
 
     /**
@@ -84,5 +84,5 @@
         $this->verify('端末種別');
     }
-    */
+     */
 
     /**
@@ -103,5 +103,5 @@
         $this->verify('ログイン状態');
     }
-    */
+     */
 }
 
Index: /branches/version-2_13-dev/html/admin/require.php
===================================================================
--- /branches/version-2_13-dev/html/admin/require.php	(revision 23546)
+++ /branches/version-2_13-dev/html/admin/require.php	(revision 23588)
@@ -30,7 +30,4 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 ob_start();
Index: /branches/version-2_13-dev/html/require.php
===================================================================
--- /branches/version-2_13-dev/html/require.php	(revision 23546)
+++ /branches/version-2_13-dev/html/require.php	(revision 23588)
@@ -33,7 +33,4 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 
Index: /branches/version-2_13-dev/html/install/index.php
===================================================================
--- /branches/version-2_13-dev/html/install/index.php	(revision 23546)
+++ /branches/version-2_13-dev/html/install/index.php	(revision 23588)
@@ -31,9 +31,5 @@
 define('INSTALL_FUNCTION', true);
 define('INSTALL_INFO_URL', 'http://www.ec-cube.net/install_info/index.php');
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
-
-define("DEFAULT_COUNTRY_ID",392);
+define("DEFAULT_COUNTRY_ID", 392);
 
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
Index: /branches/version-2_13-dev/html/define.php
===================================================================
--- /branches/version-2_13-dev/html/define.php	(revision 22070)
+++ /branches/version-2_13-dev/html/define.php	(revision 23588)
@@ -14,4 +14,9 @@
 define('USE_FILENAME_DIR_INDEX', null);
 
+// bufferを初期化する
+while (ob_get_level() > 0 && ob_get_level() > 0) {
+    ob_end_clean();
+}
+
 /*
  * Local variables: