Changeset 158

Timestamp:

Apr 6, 2009, 6:29:42 PM (15 years ago)

Author:

toemon

Message:

#91 マルチユーザモードでユーザ指定時人気記事リストブロックが表示されないバグ修正

Location:

trunk/wp-content

Files:

• plugins/xpressme/include/xpress_common_functions.php (modified) (3 diffs)
• themes/xpress_default/blocks/popular_posts_block_theme.php (modified) (4 diffs)
• themes/xpress_default/ja.mo (modified) (previous)
• themes/xpress_default/ja.po (modified) (3 diffs)

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

@@ -270 +270 @@
         $query = preg_replace('/\s\s+/', ' ', $query);
         if (!empty($_COOKIE[$author_cookie])){
-                $pattern = "WHERE(.*)post_type(.*)=(.*)'post'";
+                $pattern = "WHERE.*post_type\s*=\s*'post'\s*\)?";
                 if ( preg_match ( "/".$pattern."/i", $query, $match ) ){
                         $where_str = "$match[0]";
@@ -278 +278 @@
                                 if ( preg_match ( "/post_type/", $p, $match3 ) ){
                                         $post_prefix = preg_replace("/post_type/", "", $p);
+                                        $post_prefix = preg_replace("/\(/", "", $post_prefix);
                                         break;
                                 }
@@ -283 +284 @@
                         preg_match ( "/post_type(.*)/", $where_str, $p_match );
                         $patern = $p_match[0];
+                        $patern = preg_replace('/\)/', '\)', $patern);
+                        
                         $replace = $patern . " AND {$post_prefix}post_author = " . intval($_COOKIE[$author_cookie]) . " ";
+
                         $query = preg_replace("/$patern/", $replace, $query);
                 }

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

@@ -26 +26 @@
         $selected_author_id = xpress_selected_author_id(false); 
 
-        global $wpdb,$wp_query;
+        global $wpdb,$wp_query,$xoops_db;
         
         $db_prefix = get_wp_prefix();
@@ -43 +43 @@
         include ($mydirpath . '/wp-includes/version.php');
                 
-        $select = "SELECT $view_tb.post_views, $post_tb.ID, $post_tb.post_title, $post_tb.post_date, $user_tb.display_name";                            
-        if ($wp_db_version >= 6124){
-                $from  = " FROM ((((";
+        $select = "SELECT $view_tb.post_views, $post_tb.ID, $post_tb.post_title, $post_tb.post_date";                           
+
+                $from  = " FROM (((";
                 $from .= " $post_tb LEFT JOIN $view_tb ON $post_tb.ID = $view_tb.post_id)";
                 $from .= " INNER JOIN $term_relationships_tb ON $post_tb.ID = $term_relationships_tb.object_id)";
                 $from .= " INNER JOIN $term_taxonomy ON $term_relationships_tb.term_taxonomy_id = $term_taxonomy.term_taxonomy_id)";
-                $from .= " INNER JOIN $terms_tb ON $term_taxonomy.term_id = $terms_tb.term_id)";
-                $from .= " INNER JOIN $user_tb ON $post_tb.post_author = $user_tb.ID";
+                $from .= " INNER JOIN $terms_tb ON $term_taxonomy.term_id = $terms_tb.term_id ";
                 
-                $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 ";
-                }
+                $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) ";
+//                      $where  .= " AND ($post_tb.post_author = 2) ";
+//              }
 
                 if ($cat_select) {
@@ -67 +67 @@
                 }
                 
-        } else {
-                $from  = " FROM ((";
-                $from .= " $post_tb LEFT JOIN $view_tb ON $post_tb.ID = $view_tb.post_id)";
-                $from .= " LEFT JOIN $post2cat_tb ON $post_tb.ID = $post2cat_tb.post_id)";
-                $from .= " INNER JOIN $user_tb ON $post_tb.post_author = $user_tb.ID";
-                
-                $where = " WHERE ($post_tb.post_status = 'publish') AND  (UNIX_TIMESTAMP($post_tb.post_date) <= UNIX_TIMESTAMP())" ;
-                
-                if ($cat_select) {
-                        $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) {
                         $where .= " AND (UNIX_TIMESTAMP($post_tb.post_date) >= UNIX_TIMESTAMP(DATE_ADD(CURRENT_DATE, INTERVAL -$show_month_range month)))";
         }
         $order_limmit = " GROUP BY $post_tb.ID ORDER BY $view_tb.post_views DESC LIMIT 0, $disp_count";
-        
-        $populars = $wpdb->get_results($select . $from . $where . $order_limmit);
+        $sql = $select . $from . $where . $order_limmit;
+
+        $populars = $wpdb->get_results($sql);
         
         foreach ($populars as $popular){
@@ -156 +142 @@
                         $post_modified_date_time = $post_modified_date . ' ' . $post_modified_time ;
                         $trackback_url = trackback_url(false);
-                        $post_viwes = xpress_post_views_count($post_id,'views: %d' ,false);
+                        $post_viwes = xpress_post_views_count($post_id,__('views: %d','xpress') ,false);
 //                      if (empty($tags)) $tags = __('Not Tag');
 

trunk/wp-content/themes/xpress_default/ja.po

@@ -18 +18 @@
 "Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
 "POT-Creation-Date: 2008-08-15 21:16+0900\n"
-"PO-Revision-Date: 2009-04-02 18:19+0900\n"
+"PO-Revision-Date: 2009-04-06 00:50+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
@@ -631 +631 @@
 msgstr "テーマ選択"
 
-#: blocks/popular_posts_block_theme.php:114
-#: blocks/recent_posts_content_block_theme.php:62
-#: blocks/recent_posts_list_block_theme.php:60
+#: blocks/popular_posts_block_theme.php:125
+#: blocks/recent_posts_content_block_theme.php:68
+#: blocks/recent_posts_list_block_theme.php:67
 msgid "Tags:"
 msgstr "タグ:"
 
-#: blocks/popular_posts_block_theme.php:140
-#: blocks/recent_posts_content_block_theme.php:97
-#: blocks/recent_posts_list_block_theme.php:86
+#: blocks/popular_posts_block_theme.php:151
+#: blocks/recent_posts_content_block_theme.php:103
+#: blocks/recent_posts_list_block_theme.php:93
 msgid "Comments (0)"
 msgstr "コメントはありません"
 
-#: blocks/popular_posts_block_theme.php:140
-#: blocks/recent_posts_content_block_theme.php:97
-#: blocks/recent_posts_list_block_theme.php:86
+#: blocks/popular_posts_block_theme.php:151
+#: blocks/recent_posts_content_block_theme.php:103
+#: blocks/recent_posts_list_block_theme.php:93
 msgid "Comments (1)"
 msgstr "1件のコメント"
 
-#: blocks/popular_posts_block_theme.php:140
-#: blocks/recent_posts_content_block_theme.php:97
-#: blocks/recent_posts_list_block_theme.php:86
+#: blocks/popular_posts_block_theme.php:151
+#: blocks/recent_posts_content_block_theme.php:103
+#: blocks/recent_posts_list_block_theme.php:93
 msgid "Comments (%)"
 msgstr "Comments (%)"
+
+#: blocks/popular_posts_block_theme.php:160
+#, php-format
+msgid "views: %d"
+msgstr "閲覧 :%d回"
 
 #: blocks/recent_comments_block_theme.php:73
@@ -660 +665 @@
 msgstr "%1$s と %2$s"
 
-#: blocks/recent_posts_content_block_theme.php:72
+#: blocks/recent_posts_content_block_theme.php:78
 msgid "more"
 msgstr "続きを読む"