WordPressテンプレート機能更新。

diff --git a/include/manager/envManager.php b/include/manager/envManager.php
index 21bc1cd..8b73564 100644 (file)
--- a/include/manager/envManager.php
+++ b/include/manager/envManager.php
@@ -2247,7 +2247,29 @@ class EnvManager extends Core
         */
        public function getAllDefaultAccessPoint()
        {
-               return array('', self::M3_DIR_NAME_MOBILE, self::M3_DIR_NAME_SMARTPHONE);
+               return array('', M3_DIR_NAME_MOBILE, M3_DIR_NAME_SMARTPHONE);
+       }
+       /**
+        * 現在のアクセスポイント取得
+        *
+        * @return string                       アクセスポイント(空文字列=PC,m=携帯,s=スマートフォン)
+        */
+       public function getCurrentAccessPoint()
+       {
+               $accessPoint = '';
+               
+               switch ($this->currentPageId){
+               case self::DEFAULT_PAGE_ID:
+               default:
+                       break;
+               case self::DEFAULT_MOBILE_PAGE_ID:
+                       $accessPoint = M3_DIR_NAME_MOBILE;
+                       break;
+               case self::DEFAULT_SMARTPHONE_PAGE_ID:
+                       $accessPoint = DEFAULT_SMARTPHONE_PAGE_ID;
+                       break;
+               }
+               return $accessPoint;
        }
        /**
         * 現在のページID

diff --git a/include/wp/wpInit.php b/include/wp/wpInit.php
index c66509e..904e1fa 100644 (file)
--- a/include/wp/wpInit.php
+++ b/include/wp/wpInit.php
@@ -23,6 +23,7 @@
 function m3WpInit()
 {
        global $gEnvManager;
+       global $gContentApi;
        
        // ##### オプションデフォルト値 #####
        $timezone_string = '';
@@ -177,5 +178,8 @@ function m3WpInit()
        } else {
                $GLOBALS['m3WpCustomParams'] = unserialize($optionParams);              // 連想配列に変換
        }
+       
+       // WordPress以外のモジュールをロード
+       $gContentApi->loadModule();
 }
 ?>