- Timestamp:
- 2014/08/13 22:29:06 (10 years ago)
- Location:
- branches/version-2_13-dev
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_13-dev/.travis.yml
r23376 r23588 15 15 - curl -s http://getcomposer.org/installer | php 16 16 - php composer.phar install --dev --no-interaction 17 - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE myapp_test;'; fi"18 17 - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi" 19 - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database myapp_test;' -U postgres; fi"20 18 - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi" 21 19 - cp tests/require.php.jenkins tests/require.php -
branches/version-2_13-dev/html/admin/require.php
r23546 r23588 30 30 31 31 require_once HTML_REALDIR . 'define.php'; 32 if (ob_get_level() > 0 && ob_get_length() > 0) {33 while (ob_end_clean());34 }35 32 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 36 33 ob_start(); -
branches/version-2_13-dev/html/define.php
r22070 r23588 14 14 define('USE_FILENAME_DIR_INDEX', null); 15 15 16 // bufferを初期化する 17 while (ob_get_level() > 0 && ob_get_level() > 0) { 18 ob_end_clean(); 19 } 20 16 21 /* 17 22 * Local variables: -
branches/version-2_13-dev/html/install/index.php
r23546 r23588 31 31 define('INSTALL_FUNCTION', true); 32 32 define('INSTALL_INFO_URL', 'http://www.ec-cube.net/install_info/index.php'); 33 if (ob_get_level() > 0 && ob_get_length() > 0) { 34 while (ob_end_clean()); 35 } 36 37 define("DEFAULT_COUNTRY_ID",392); 33 define("DEFAULT_COUNTRY_ID", 392); 38 34 39 35 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; -
branches/version-2_13-dev/html/require.php
r23546 r23588 33 33 34 34 require_once HTML_REALDIR . 'define.php'; 35 if (ob_get_level() > 0 && ob_get_length() > 0) {36 while (ob_end_clean());37 }38 35 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 39 36 -
branches/version-2_13-dev/tests/class/Common_TestCase.php
r23539 r23588 29 29 protected function setUp() 30 30 { 31 $this->objQuery = SC_Query_Ex::getSingletonInstance('', true);32 $this->objQuery->begin();31 $this->objQuery = SC_Query_Ex::getSingletonInstance('', true); 32 $this->objQuery->begin(); 33 33 } 34 34 … … 65 65 $this->verify('exitしたかどうか'); 66 66 } 67 */67 */ 68 68 69 69 /** … … 84 84 $this->verify('端末種別'); 85 85 } 86 */86 */ 87 87 88 88 /** … … 103 103 $this->verify('ログイン状態'); 104 104 } 105 */105 */ 106 106 } 107 107
Note: See TracChangeset
for help on using the changeset viewer.