Changeset 300 for trunk

Timestamp:

Jun 19, 2009, 10:40:34 PM (15 years ago)

Author:

toemon

Message:

XOOPSの管理メニューでXPressME管理メニューに「モジュールへ」のリンクメニューを追加 fixes #161
r301 での変更をマージ

Location:

trunk

Files:

• external/xpress_i18n/ja_EUC/language/japanese/modinfo.php (modified) (1 diff)
• external/xpress_i18n/ja_UTF/language/ja_utf8/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/admin/menu.php (modified) (1 diff)
• xpressme_integration_kit/class/check_blocks_class.php (modified) (1 diff)
• xpressme_integration_kit/language/english/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/modinfo.php (modified) (1 diff)

trunk/external/xpress_i18n/ja_EUC/language/japanese/modinfo.php

@@ -20 +20 @@
         define("_MI_XP2_MENU_ADMIN","WordPress´ÉÍý");
         define("_MI_XP2_MENU_XPRESS","XPressMEÀßÄê");
+        define("_MI_XP2_MENU_TO_MODULE","¥â¥¸¥å¡¼¥ë¤Ø");
 
         // Block Name

trunk/external/xpress_i18n/ja_UTF/language/ja_utf8/modinfo.php

@@ -20 +20 @@
         define("_MI_XP2_MENU_ADMIN","WordPress管理");
         define("_MI_XP2_MENU_XPRESS","XPressME設定");
+        define("_MI_XP2_MENU_TO_MODULE","モジュールへ");
 
         // Block Name

trunk/xpressme_integration_kit/admin/menu.php

@@ -55 +55 @@
 $adminmenu[$i++]['link'] = "admin/wp_admin.php";
 
+$adminmenu[$i]['title'] = _MI_XP2_MENU_TO_MODULE ;
+$adminmenu[$i++]['link'] = "index.php";
+
+
 ?>

trunk/xpressme_integration_kit/class/check_blocks_class.php

@@ -217 +217 @@
                 $option_arr_1 = explode( '|', $info['options'] );
                 $option_arr_2 = explode( '|', $block_obj->getVar('options', 'n') );
-
-                if ( count($option_arr_1) != count($option_arr_2) )
-                {
-                        $this->_err( $name.': options count unmatch' );
+                
+                $excludes_block = array('widget_block.php','popular_posts_block.php','recent_comments_block.php','recent_posts_content_block.php','recent_posts_list_block.php');
+                
+                if (in_array($info['file'],$excludes_block)){
+                        if ( count($option_arr_1) > count($option_arr_2) )
+                        {
+                                $this->_err( $name.': options count unmatch' );
+                        }
+
+                } else {
+                        if ( count($option_arr_1) != count($option_arr_2) )
+                        {
+                                $this->_err( $name.': options count unmatch' );
+                        }
                 }
         }

trunk/xpressme_integration_kit/language/english/modinfo.php

@@ -20 +20 @@
         define("_MI_XP2_MENU_ADMIN","WordPress Admin");
         define("_MI_XP2_MENU_XPRESS","XPressME Setting");
+        define("_MI_XP2_MENU_TO_MODULE","to Modules");
 
         // Block Name

trunk/xpressme_integration_kit/language/ja_utf8/modinfo.php

@@ -20 +20 @@
         define("_MI_XP2_MENU_ADMIN","WordPress管理");
         define("_MI_XP2_MENU_XPRESS","XPressME設定");
+        define("_MI_XP2_MENU_TO_MODULE","モジュールへ");
 
         // Block Name