Changeset 22071

Timestamp:

2012/11/05 12:02:27 (11 years ago)

Author:

adachi

Message:

#1956 output_handlerのwarningを修正

Location:

branches/version-2_12-dev/html

Files:

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

branches/version-2_12-dev/html/.htaccess

@@ -3 +3 @@
 php_value mbstring.language Japanese
 php_flag mbstring.encoding_translation off
-php_value output_handler NULL
+php_value output_handler none
 php_flag magic_quotes_gpc off
 php_flag session.auto_start 0

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

@@ -27 +27 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0) {
+if (ob_get_level() > 0 && ob_get_length() > 0) {
     while (ob_end_clean());
 }

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

@@ -28 +28 @@
 define('INSTALL_FUNCTION', true);
 define('INSTALL_INFO_URL', 'http://www.ec-cube.net/install_info/index.php');
-if (ob_get_level() > 0) {
+if (ob_get_level() > 0 && ob_get_length() > 0) {
     while (ob_end_clean());
 }

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

@@ -30 +30 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0) {
+if (ob_get_level() > 0 && ob_get_length() > 0) {
     while (ob_end_clean());
 }