Merge branch 'dev-2' of github.com:basercms/basercms into dev-2

MASA-P · Jun 18, 2013 · 8ee6be9 · 8ee6be9
2 parents bfc4fb5 + bfed068
commit 8ee6be9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/baser/config/credit.php b/baser/config/credit.php
@@ -54,8 +54,11 @@
 			array('name' => 'Nobuyuki Sato', 'url' => 'http://www.mmpf-develop.com/', 'twitter' => 'mmpf_develop'),
 			array('name' => 'Taku Fujita', 'url' => 'http://kototoy.jp/', 'twitter' => 'takufujita'),
 			array('name' => 'Munenori Nishimura', 'url' => 'http://www.asparagus.jp/', 'twitter' => 'mune_nori'),
-			array('name' => 'Shogo Tamura', 'url' => 'http://caracri-works.com/', 'twitter' => 'tamshow_'),
-			array('name' => 'Atsushi Shibata', 'url' => '', 'twitter' => '')
+			array('name' => 'Shogo Tamura', 'url' => 'http://tamshow.com/', 'twitter' => 'tamshow_'),
+			array('name' => 'Atsushi Shibata', 'url' => '', 'twitter' => ''),
+			array('name' => 'Tsuyoshi Kaneko', 'url' => 'http://webcake.no003.info/', 'twitter' => 'andante0727'),
+			array('name' => 'PCWorkSupporter oconos', 'url' => 'http://pws-oconos.net/', 'twitter' => ''),
+			array('name' => 'king', 'url' => 'http://www.e-king.co.jp/', 'twitter' => 'king_rental')
 		),
 		'developpers' => array(
 			array('name' => 'Takason', 'url' => '', 'twitter' => 'takason'),
@@ -72,6 +75,7 @@
 			array('name' => 'Tetuya Takahashi', 'url' => 'http://www.ls-e.com', 'twitter' => ''),		
 			array('name' => 'Masanori Matsumoto', 'url' => '', 'twitter' => 'mattun0313'),
 			array('name' => 'Sunao Kiyosue', 'url' => 'http://www.pictnotes.jp/', 'twitter' => 'itm_kiyo'),		
-			array('name' => 'Kanji Hatamoto', 'url' => '', 'twitter' => 'kanjihtmt')
+			array('name' => 'Kanji Hatamoto', 'url' => '', 'twitter' => 'kanjihtmt'),
+			array('name' => 'Takayuki.Gondoh', 'url' => 'http://blog.gufii.net', 'twitter' => 'gondoh_jp')
 		)
 	);
diff --git a/baser/controllers/baser_app_controller.php b/baser/controllers/baser_app_controller.php
@@ -1268,11 +1268,15 @@ function redirect($url, $status = null, $exit = true) {
 		$url = addSessionId($url, true);
 		// 管理システムでのURLの生成が CakePHP の標準仕様と違っていたので調整
 		// ※ Routing.admin を変更した場合
-		if (!isset($url['admin']) && !empty($this->params['admin'])) {
-			$url['admin'] = true;
-		} elseif (isset($url['admin']) && !$url['admin']) {
-			unset($url['admin']);
+		// >>> CUSTOMIZE MODIFY 2013/06/17 arata
+		if(is_array($url)) {
+			if (!isset($url['admin']) && !empty($this->params['admin'])) {
+				$url['admin'] = true;
+			} elseif (isset($url['admin']) && !$url['admin']) {
+				unset($url['admin']);
+			}
 		}
+		// <<<
 		parent::redirect($url, $status, $exit);
 
 	}

diff --git a/baser/controllers/mobile_controller.php b/baser/controllers/mobile_controller.php
@@ -36,7 +36,7 @@ class MobileController extends AppController {
  * return void
  * access public
  */
-	function ga() {
+	function mobile_ga() {
 
 		if(empty($this->siteConfigs['google_analytics_id']) || !version_compare ( preg_replace('/[a-z-]/','', phpversion()), '5','>=')) {
 			header("Content-Type: image/gif");