Changeset 451 for branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

Timestamp:

Nov 20, 2009, 2:52:16 PM (14 years ago)

Author:

toemon

Message:

MUブランチにVer2.2.0RC1の変更内容をマージ

File:

• branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (4 diffs)

branches/XPressMU/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -1 +1 @@
 <?php
-//if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
-
+// Block Version: 1.0
 function recent_posts_content_block($options)
 {
         $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
         $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[1] );
-        $day_select = ($options[2])?intval($options[2]):0;
-        $day_size = ($options[3])?intval($options[3]):0;
-        $disp_count =  ($options[4])?intval($options[4]):10;
-        $excerpt = empty( $options[5] ) ? false : true ;
-        $excerpt_size =  ($options[6])?intval($options[6]):100;
-        $date_format = empty( $options[7] ) ? '' : $options[7] ;
-        $time_format = empty( $options[8] ) ? '' : $options[8] ;
-        $tag_select = $options[9] ;
-    $selected = array_slice($options,10); // get allowed cats
-
+        $disp_count =  ($options[2])?intval($options[2]):10;
+        $excerpt = empty( $options[3] ) ? false : true ;
+        $excerpt_size =  ($options[4])?intval($options[4]):100;
+        $date_format = empty( $options[5] ) ? '' : $options[5] ;
+        $time_format = empty( $options[6] ) ? '' : $options[6] ;
+        $tag_select = $options[7] ;
+        $cat_select = empty( $options[8] ) ? '0' : $options[8] ;
+        $day_select = ($options[9])?intval($options[9]):0;
+        $day_size = ($options[10])?intval($options[10]):0;
+
+        $selected = explode(',' , $cat_select);
+        
         $mydirpath = get_xpress_dir_path();
         
@@ -21 +22 @@
         if (empty($time_format)) $time_format = get_settings('time_format');
         if(empty($tag_select)) $tag_where = ''; else $tag_where = "tag='$tag_select'&";
-        
+        if (array_search(0,$selected)===0) $cat_select = 0;
+
         $selected_author_id = xpress_selected_author_id('echo=0');      
         if (!empty($selected_author_id)){
@@ -37 +39 @@
         if (!is_null($wpdb)){
                 $wp_query->in_the_loop = true;          //for use the_tags() in multi lopp 
-                if (array_search(0,$selected)===0) {
+                if ($cat_select) {
+                        $r = new WP_Query($author_where . $tag_where ."cat=$cat_select&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                } else {
                         $r = new WP_Query($author_where . $tag_where ."showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
-                } else {
-                        $cat_id = implode(',',$selected);
-                        $r = new WP_Query($author_where . $tag_where ."cat=$cat_id&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
                 }
                 while($r->have_posts()){                        
@@ -52 +53 @@
                         if ($day_select == 2){
                                 $post_date = mktime (0, 0, 0, get_the_time("m"), get_the_time("d"), get_the_time("Y"));
-                                if (empty($lastes_date)) $lastes_date = $post_date;
-                                $base_date = $lastes_date - $between_days;
+                                if (empty($latest_date)) $latest_date = $post_date;
+                                $base_date = $latest_date - $between_days;
                                 if ($post_date < $base_date) continue;
                         }