Mercurial > hg > isophonics-drupal-site
comparison core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | c2387f117808 |
children |
comparison
equal
deleted
inserted
replaced
16:c2387f117808 | 17:129ea1e6d783 |
---|---|
76 | 76 |
77 $parsed += ['query' => []]; | 77 $parsed += ['query' => []]; |
78 $options += ['query' => []]; | 78 $options += ['query' => []]; |
79 | 79 |
80 $options['query'] = NestedArray::mergeDeep($parsed['query'], $options['query']); | 80 $options['query'] = NestedArray::mergeDeep($parsed['query'], $options['query']); |
81 ksort($options['query']); | |
82 | 81 |
83 if ($parsed['fragment'] && !$options['fragment']) { | 82 if ($parsed['fragment'] && !$options['fragment']) { |
84 $options['fragment'] = '#' . $parsed['fragment']; | 83 $options['fragment'] = '#' . $parsed['fragment']; |
85 } | 84 } |
86 | 85 |