Changeset 23588 for branches/version-2_13-dev/html

Timestamp:

2014/08/13 22:29:06 (12 years ago)

Author:

kimoto

Message:

#2386 PHP 警告撲滅 for 2.13.3

PHP Notice: ob_end_clean(): failed to delete buffer. No buffer to delete が出ているので修正
合わせて同じ処理が3ファイルに書かれていたので集約
travis.ymlの不要な行を削除
indentの修正

Location:

branches/version-2_13-dev/html

Files:

• admin/require.php (modified) (1 diff)
• define.php (modified) (1 diff)
• install/index.php (modified) (1 diff)
• require.php (modified) (1 diff)

branches/version-2_13-dev/html/admin/require.php

@@ -30 +30 @@
 
 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();

branches/version-2_13-dev/html/define.php

@@ -14 +14 @@
 define('USE_FILENAME_DIR_INDEX', null);
 
+// bufferを初期化する
+while (ob_get_level() > 0 && ob_get_level() > 0) {
+    ob_end_clean();
+}
+
 /*
  * Local variables:

branches/version-2_13-dev/html/install/index.php

@@ -31 +31 @@
 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';

branches/version-2_13-dev/html/require.php

@@ -33 +33 @@
 
 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';