Ignore:
Timestamp:
2011/09/26 16:59:34 (9 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21257
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
html/.htaccess 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2F.htaccess
html/require.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Frequire.php
php.ini 19658@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fphp.ini
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110926075834-4rzol2buff3qnz9v
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110926075930-z5cza240d17menk9
bzr:revno:
3956
bzr:revprop:branch-nick:
branches/version-2_11-dev
bzr:root:
branches/version-2_11-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110926075930-z5cza240d17menk9
sha1: 4c3b7f875b1a9583b01e23a97c0d557324899794
bzr:text-parents:

data/class/SC_Initial.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21180
html/.htaccess svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21181
html/require.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21011
php.ini svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21180
bzr:timestamp:
2011-09-26 16:59:30.736000061 +0900
bzr:user-agent:
bzr2.4.1+bzr-svn1.1.0
Message:

#1433 (PHP Notice が発生する)

  • IIS + PHP5.2.x の場合に error_reporting の設定が効かなくなってしまうため, r21180, r21181 を差し戻し
  • Notice を発生させていた箇所を修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/html/require.php

    r21011 r21258  
    2525define('HTML_REALDIR', rtrim(realpath(rtrim(realpath(dirname(__FILE__)), '/\\') . '/'), '/\\') . '/'); 
    2626 
    27 if (ADMIN_FUNCTION !== true) { 
     27if (!defined('ADMIN_FUNCTION') || ADMIN_FUNCTION !== true) { 
    2828    define('FRONT_FUNCTION', true); 
    2929} 
    3030 
    3131require_once HTML_REALDIR . 'define.php'; 
    32  
    33 if (SAFE === true) { 
     32if (defined('SAFE') && SAFE === true) { 
    3433    require_once HTML_REALDIR . HTML2DATA_DIR . 'require_safe.php'; 
    3534} else { 
Note: See TracChangeset for help on using the changeset viewer.