Changeset 157 for trunk

Timestamp:

Apr 6, 2009, 12:33:22 AM (16 years ago)

Author:

toemon

Message:

#90 マルチループを使っているブロックがマルチユーザに対応していない　に対する修正

Location:

trunk/wp-content

Files:

• plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• themes/xpress_default/blocks/popular_posts_block_theme.php (modified) (3 diffs)
• themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (2 diffs)
• themes/xpress_default/blocks/recent_posts_list_block_theme.php (modified) (2 diffs)

trunk/wp-content/plugins/xpressme/include/custom_functions.php

@@ -7 +7 @@
                 $user_info = get_userdata($uid);
                 $output = $user_info->display_name;
+        }
+        if (empty($show))
+                return $output;
+        else
+                echo $output;
+                
+}
+function xpress_selected_author_id($show=true ) {
+        $output = '';
+        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        if (!empty($_COOKIE[$author_cookie])){
+                $output = intval($_COOKIE[$author_cookie]);
+        } else {
+                $output = '';
         }
         if (empty($show))

trunk/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php

@@ -23 +23 @@
         $block = array();
         $item_no = 0;   
+        
+        $selected_author_id = xpress_selected_author_id(false); 
 
         global $wpdb,$wp_query;
@@ -51 +53 @@
                 
                 $where = " WHERE ($post_tb.post_type = 'post') AND ($post_tb.post_status = 'publish')";
+                if (!empty($selected_author_id)){
+                        $where  .= " AND $post_tb.post_author = $selected_author_id ";
+                }
 
                 if ($cat_select) {
@@ -73 +78 @@
                         $where .= " AND ($post2cat_tb.category_id IN ($cat_id))";
                 }
+                if (!empty($selected_author_id)){
+                        $where  .= " AND $post_tb.post_author = $selected_author_id ";
+                }
+
         }
         if ($show_month_range > 0) {

trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -20 +20 @@
         if(empty($tag_select)) $tag_where = ''; else $tag_where = "tag='$tag_select'&";
         
+        $selected_author_id = xpress_selected_author_id(false); 
+        if (!empty($selected_author_id)){
+                $author_where ="author=$selected_author_id&";
+        } else {
+                $author_where = '';
+        }
         global $wpdb,$wp_query;
         $block = array();
@@ -26 +32 @@
                 $wp_query->in_the_loop = true;          //for use the_tags() in multi lopp 
                 if (array_search(0,$selected)===0) {
-                        $r = new WP_Query($tag_where ."showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                        $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($tag_where . "cat=$cat_id&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                        $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()){                        

trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php

@@ -17 +17 @@
         if (empty($time_format)) $time_format = get_settings('time_format');
         if(empty($tag_select)) $tag_where = ''; else $tag_where = "tag='$tag_select'&";
+
+        $selected_author_id = xpress_selected_author_id(false); 
+        if (!empty($selected_author_id)){
+                $author_where ="author=$selected_author_id&";
+        } else {
+                $author_where = '';
+        }
         
         global $wpdb,$wp_query;
@@ -24 +31 @@
                 $wp_query->in_the_loop = true;          //for use the_tags() in multi lopp 
                 if (array_search(0,$selected)===0) {
-                        $r = new WP_Query($tag_where ."showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                        $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($tag_where . "cat=$cat_id&showposts=$disp_count&what_to_show=posts&nopaging=0&post_status=publish");
+                        $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()){