Changeset 554

Timestamp:

Mar 17, 2010, 3:27:24 PM (14 years ago)

Author:

toemon

Message:

MultiBlogに設定していないときのMultiBlog用ブロックの表示修正 Fixes#317

Location:

trunk/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)

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_popular_posts_block_theme.php

@@ -171 +171 @@
                         $wp_rewrite->init();
                 }
+                usort($data_array, "post_views_cmp");
+                if (!empty($disp_count)){
+                        $data_array = array_slice($data_array,0,$disp_count);
+                }
+
+                $item_no = 0;
+                foreach ($data_array as $data) {
+                        $block['contents']['item'.$item_no] = $data;
+                        $item_no++;
+                }
+                $block['data_count'] = $item_no;
+        } else {
+                $block['err_message'] = __('This blog is not set to the multi blog.', 'xpress');
         }
-        
-        usort($data_array, "post_views_cmp");
-        if (!empty($disp_count)){
-                $data_array = array_slice($data_array,0,$disp_count);
-        }
-
-        $item_no = 0;
-        foreach ($data_array as $data) {
-                $block['contents']['item'.$item_no] = $data;
-                $item_no++;
-        }
-        $block['data_count'] = $item_no;
-
         return $block ;
 }

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/global_recent_comments_block_theme.php

@@ -116 +116 @@
                         $wp_rewrite->init();
                 } // end of foreach
+                usort($comment_array, "the_comment_time_cmp");
+                if (!empty($disp_count)){
+                        $comment_array = array_slice($comment_array,0,$disp_count);
+                }
+
+                $item_no = 0;
+                foreach ($comment_array AS $comment) {
+                        $block['contents']['item'.$item_no] = $comment;
+                        $item_no++;
+                }
+                $block['data_count'] = $item_no;
+        } else {
+                $block['err_message'] = __('This blog is not set to the multi blog.', 'xpress');
         }
-        usort($comment_array, "the_comment_time_cmp");
-        if (!empty($disp_count)){
-                $comment_array = array_slice($comment_array,0,$disp_count);
-        }
-
-        $item_no = 0;
-        foreach ($comment_array AS $comment) {
-                $block['contents']['item'.$item_no] = $comment;
-                $item_no++;
-        }
-        $block['data_count'] = $item_no;
 
         return $block ;