Changeset 793 for branches/Ver2.5/xpressme_integration_kit/wp-content/themes

Timestamp:

Oct 7, 2011, 9:03:08 AM (13 years ago)

Author:

toemon

Message:

マルチサイト用、最近の投稿（全ブログ）ブロックのオプションに「対象ブログの除外」、「ブログ毎に抽出」を追加、ブロックオプションのデフォルトテンプレートの誤りを修正

Location:

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks

Files:

• global_popular_posts_block_theme.php (modified) (1 diff)
• global_recent_comments_block_theme.php (modified) (1 diff)
• global_recent_posts_list_block_theme.php (modified) (4 diffs)

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_popular_posts_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_grobal_popular_posts_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $show_month_range = empty( $options[3] ) ? '0' : $options[3] ;

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_comments_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_global_recent_comments_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $disp_length = empty( $options[3] ) ? '30' : $options[3] ;

branches/Ver2.5/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_posts_list_block_theme.php

@@ -4 +4 @@
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[1] );
+        $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_global_recent_posts_list_block.html' : trim( $options[1] );
         $disp_count = empty( $options[2] ) ? '10' : $options[2] ;
         $disp_red = empty( $options[3] ) ? '1' : $options[3] ;
@@ -10 +10 @@
         $date_format = empty( $options[5] ) ? '' : $options[5] ;
         $time_format = empty( $options[6] ) ? '' : $options[6] ;
+        $shown_for_each_blog = empty( $options[7] ) ? false : true ;            
+        $exclusion_blog = empty( $options[8] ) ? '0' : $options[8] ;
+        
         $mydirpath = get_xpress_dir_path();
         
@@ -20 +23 @@
                 $block = array();
                 
-                $data_array = xpress_grobal_recent_posts($disp_count);
+                $data_array = xpress_grobal_recent_posts($disp_count,$exclusion_blog,$shown_for_each_blog);
                 $item_no = 0;
                 $red_sec = $disp_red *60*60*24;
@@ -41 +44 @@
                 }
                 $block['data_count'] = $item_no;  //xml unserialise error
+                $block['shown_for_each_blog'] = $shown_for_each_blog;
         } else {
                 $block['err_message'] = __('This blog is not set to the multi blog.', 'xpress');