Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	(revision 19670)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php	(revision 19711)
@@ -94,10 +94,10 @@
         $from  = ", dtb_blocposition AS pos";
         $where = " where ";
-        $where .= "( pos.anywhere = 1 OR (lay.page_id = ? AND ";
+        $where .= "( pos.anywhere = 1 OR (lay.device_type_id = ? AND lay.page_id = ? AND ";
         $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
         //        $where .= "((lay.page_id = ? AND ";
         //        $where .= "lay.page_id = pos.page_id AND exists (select bloc_id from dtb_bloc as blc where pos.bloc_id = blc.bloc_id) )) ORDER BY lay.page_id,pos.target_id, pos.bloc_row, pos.bloc_id ";
 
-        $arrData = array($page_id);
+        $arrData = array($_GET['device_type_id'], $page_id);
         $arrBlocPos = $this->lfgetLayoutData($sel, $from, $where, $arrData );
 
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	(revision 19670)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Plugin.php	(revision 19711)
@@ -7,5 +7,5 @@
      * インスタンス化
      */
-    public static function load(LC_Page &$lcpage){
+    function load(LC_Page &$lcpage){
         //データベースからクラス名を読み込む
         $objQuery = new SC_Query();
@@ -34,5 +34,5 @@
     }
 
-    public static function preProcess(LC_Page &$lcpage){
+    function preProcess(LC_Page &$lcpage){
         //プラグインの名前を判別してページ内で有効なプラグインがあれば実行する
         $arrPluginList = SC_Helper_Plugin::load($lcpage);
@@ -49,5 +49,5 @@
      *
      */
-    public static function process(LC_Page &$lcpage){
+    function process(LC_Page &$lcpage){
         //プラグインの名前を判別してページ内で有効なプラグインがあれば実行する
         $arrPluginList = SC_Helper_Plugin::load($lcpage);
@@ -64,5 +64,5 @@
      * 稼働中のプラグインを取得する。
      */
-    public static function getEnablePlugin(){
+    function getEnablePlugin(){
         $objQuery = new SC_Query();
         $col = '*';
@@ -76,5 +76,5 @@
      * インストールされているプラグインを取得する。
      */
-    public static function getAllPlugin(){
+    function getAllPlugin(){
         $objQuery = new SC_Query();
         $col = '*';
@@ -85,11 +85,9 @@
     }
 
-
-    public static function getFilesystemPlugins(){
+    function getFilesystemPlugins(){
         $plugin_dir = DATA_PATH."/plugin/";
         if($dh = opendir($plugin_dir)){
             while(($file = readdir($dh) !== false)){
                 if(is_dir($plugin_dir."/".$file)){
-                     
                 }
             }
@@ -97,3 +95,2 @@
     }
 }
-