viewgit/inc/functions.php:22 Function utf8_encode() is deprecated [8192]

Remove limit_feed adds s=news to network iterator query, a=chris

Chris Pollett [2016-11-16 03:Nov:th]
Remove limit_feed adds s=news to network iterator query, a=chris
Filename
src/library/index_bundle_iterators/NetworkIterator.php
src/models/PhraseModel.php
diff --git a/src/library/index_bundle_iterators/NetworkIterator.php b/src/library/index_bundle_iterators/NetworkIterator.php
index c3a50ef4c..e3f0a28da 100644
--- a/src/library/index_bundle_iterators/NetworkIterator.php
+++ b/src/library/index_bundle_iterators/NetworkIterator.php
@@ -112,22 +112,15 @@ class NetworkIterator extends IndexBundleIterator
      *      so the queries on those machine can make savepoints. Note the
      *      format of save_timestamp is timestamp-query_part where query_part
      *      is the number of the item in a query presentation (usually 0).
-     * @param bool $limit_feeds if true the number of feed shard items to
-     *      allow in search results is limited to
-     *      WordIterator::LIMIT_FEEDS_COUNT
-     *
      */
     public function __construct($query, $queue_servers, $timestamp,
-        &$filter = null, $save_timestamp_name = "", $limit_feeds = true)
+        &$filter = null, $save_timestamp_name = "")
     {
         $this->results_per_block = ceil(self::MIN_FIND_RESULTS_PER_BLOCK);
         $this->next_results_per_block = $this->results_per_block;
         $this->hard_query = false;
         $this->base_query = "q=".urlencode($query).
             "&f=serial&network=false&raw=1&its=$timestamp&guess=false";
-        if (!$limit_feeds) {
-            $this->base_query .= "&s=news";
-        }
         if ($save_timestamp_name!="") {
             // used for archive crawls of crawl mixes
             $this->base_query .= "&save_timestamp=$save_timestamp_name";
@@ -353,4 +346,3 @@ class NetworkIterator extends IndexBundleIterator
         return $pages;
     }
 }
- ?>
diff --git a/src/models/PhraseModel.php b/src/models/PhraseModel.php
index 9fd8c2940..1af65c488 100755
--- a/src/models/PhraseModel.php
+++ b/src/models/PhraseModel.php
@@ -1598,8 +1598,7 @@ class PhraseModel extends ParallelModel
                 $index_name = $this->index_name;
             }
             $iterators[0] = new I\NetworkIterator($original_query,
-                $queue_servers, $index_name, $filter, $save_timestamp_name,
-                $limit_feeds);
+                $queue_servers, $index_name, $filter, $save_timestamp_name);
         }
         if (!$network_flag) {
             $doc_iterate_hashes = [substr(L\crawlHashWord("site:any"), 0, 9),
ViewGit