Commit 7c9b78a6 authored by Andrey Tymchuk's avatar Andrey Tymchuk Committed by Andrey Tymchuk
Browse files

Issue #3178229 by gbyte, WalkingDexter, minorwm: Don't de-duplicate URLs with... 

Issue #3178229 by gbyte, WalkingDexter, minorwm: Don't de-duplicate URLs with different query strings
parent ac226387

src/Queue/QueueWorker.php

+10 −7
Original line number Diff line number Diff line
@@ -371,13 +371,16 @@ class QueueWorker { 
   */

  protected function removeDuplicates(array &$results): void {

    if ($this->generatorSettings['remove_duplicates'] && !empty($results)) {

      $result = $results[key($results)];

      if (isset($result['meta']['path'])) {

        if (isset($this->processedPaths[$result['meta']['path']])) {

          $results = [];

      foreach ($results as $key => $result) {

        if (isset($result['url'])) {

          $url = (string) $result['url'];



          if (isset($this->processedPaths[$url])) {

            unset($results[$key]);

          }

          else {

          $this->processedPaths[$result['meta']['path']] = TRUE;

            $this->processedPaths[$url] = TRUE;

          }

        }

      }

    }

tests/src/Functional/SimplesitemapTest.php

+2 −1
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ class SimplesitemapTest extends SimplesitemapTestBase { 
    $this->generator

      ->saveSetting('generate_duration', $generate_duration)

      ->saveSetting('max_links', $max_links)

      ->saveSetting('skip_untranslated', FALSE);

      ->saveSetting('skip_untranslated', FALSE)

      ->saveSetting('remove_duplicates', FALSE);



    $this->generator->rebuildQueue();

    $generate_count = 0;