Skip to content

Commit

Permalink
Merge pull request #82 from s-nakajima/master
Browse files Browse the repository at this point in the history
SQLデバッグが表示されないバグ修正
  • Loading branch information
s-nakajima committed Oct 17, 2016
2 parents 528bcc1 + e04ecb2 commit 642e8b2
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions Utility/SiteSettingUtil.php
Expand Up @@ -43,8 +43,6 @@ class SiteSettingUtil {
* @return void
*/
public static function initialize() {
$SiteSetting = ClassRegistry::init('SiteManager.SiteSetting');

self::setup(array(
// * サイト名
'App.site_name',
Expand Down Expand Up @@ -89,7 +87,6 @@ public static function initialize() {
//下記は設定は、Configureにもwriteする
$siteSetting = array(
'Config.language',
'debug',
'theme',
);
foreach ($siteSetting as $key) {
Expand All @@ -99,12 +96,6 @@ public static function initialize() {
//Sessionの設定値を変えるため、Configureにセットする
$session = Hash::merge(Configure::read('Session'), self::read('Session'));
Configure::write('Session', $session);

//debugについては、セッションがある場合セッションを優先する
$debugs = $SiteSetting->debugOptions;
if (in_array(CakeSession::read('debug'), array_keys($debugs), true)) {
Configure::write('debug', CakeSession::read('debug'));
}
}

/**
Expand Down

0 comments on commit 642e8b2

Please sign in to comment.