Merge pull request #2068 from opensource-workshop/issue-2067

[サイト内検索] 多言語モード採用時、対象言語ページの絞り込みが効かないバグを修正

Author: masaton0216

app/Plugins/User/Bbses/BbsesPlugin.php

@@ -278,7 +278,7 @@ public static function getWhatsnewArgs()
     /**
      * 検索用メソッド
      */
-    public static function getSearchArgs($search_keyword)
+    public static function getSearchArgs($search_keyword, $page_ids = null)
     {
         $return[] = BbsPost::
             select(
@@ -303,6 +303,7 @@ public static function getSearchArgs($search_keyword)
             })
             ->join('frames', 'frames.bucket_id', '=', 'bbses.bucket_id')
             ->leftjoin('pages', 'pages.id', '=', 'frames.page_id')
+            ->whereIn('pages.id', $page_ids)
             ->where(function ($plugin_query) use ($search_keyword) {
                 $plugin_query->where('bbs_posts.title', 'like', '%' . $search_keyword . '%')
                     ->orWhere('bbs_posts.body', 'like', '%' . $search_keyword . '%');

app/Plugins/User/Faqs/FaqsPlugin.php

@@ -363,7 +363,7 @@ public static function getWhatsnewArgs()
     /**
      *  検索用メソッド
      */
-    public static function getSearchArgs($search_keyword)
+    public static function getSearchArgs($search_keyword, $page_ids = null)
     {
         $return[] = DB::table('faqs_posts')
                       ->select(
@@ -385,6 +385,7 @@ public static function getSearchArgs($search_keyword)
                       ->join('frames', 'frames.bucket_id', '=', 'faqs.bucket_id')
                       ->leftJoin('categories', 'categories.id', '=', 'faqs_posts.categories_id')
                       ->leftjoin('pages', 'pages.id', '=', 'frames.page_id')
+                      ->whereIn('pages.id', $page_ids)
                       ->where('status', '?')
                       ->where(function ($plugin_query) use ($search_keyword) {
                           $plugin_query->where('faqs_posts.post_title', 'like', "%$search_keyword%")

app/Plugins/User/Learningtasks/LearningtasksPlugin.php

@@ -698,7 +698,7 @@ public static function getWhatsnewArgs()
     /**
      *  検索用メソッド
      */
-    public static function getSearchArgs($search_keyword)
+    public static function getSearchArgs($search_keyword, $page_ids = null)
     {
         $return[] = DB::table('learningtasks_posts')
                       ->select(
@@ -719,6 +719,7 @@ public static function getSearchArgs($search_keyword)
                       ->join('frames', 'frames.bucket_id', '=', 'learningtasks.bucket_id')
                       ->leftJoin('categories', 'categories.id', '=', 'learningtasks_posts.categories_id')
                       ->leftjoin('pages', 'pages.id', '=', 'frames.page_id')
+                      ->whereIn('pages.id', $page_ids)
                       ->where('status', '?')
                       ->where(function ($plugin_query) use ($search_keyword) {
                           $plugin_query->where('learningtasks_posts.post_title', 'like', '?')