opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.7. For more information, see https://www.drupal.org/project/drupal/releases/8.1.7

Browse source
This commit is contained in:
Pantheon Automation 2016-07-18 09:07:48 -07:00 • committed by Greg Anderson
parent 38ba7c357d
commit e9f047ccf8
61 changed files with 1613 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
View file

@ -206,7 +206,7 @@ class ConfigDependencyManager {
* @return int
* The comparison result for uasort().
*/
protected function sortGraphByWeight(array $a, array $b) {
protected static function sortGraphByWeight(array $a, array $b) {
$weight_cmp = SortArray::sortByKeyInt($a, $b, 'weight');
if ($weight_cmp === 0) {
@ -227,7 +227,7 @@ class ConfigDependencyManager {
* @return int
* The comparison result for uasort().
*/
public function sortGraph(array $a, array $b) {
public static function sortGraph(array $a, array $b) {
$weight_cmp = SortArray::sortByKeyInt($a, $b, 'weight') * -1;
if ($weight_cmp === 0) {

7
core/lib/Drupal/Core/Http/ClientFactory.php
View file

@ -52,6 +52,13 @@ class ClientFactory {
'User-Agent' => 'Drupal/' . \Drupal::VERSION . ' (+https://www.drupal.org/) ' . \GuzzleHttp\default_user_agent(),
],
'handler' => $this->stack,
// Security consideration: prevent Guzzle from using environment variables
// to configure the outbound proxy.
'proxy' => [
'http' => NULL,
'https' => NULL,
'no' => [],
]
];
$config = NestedArray::mergeDeep($default_config, Settings::get('http_client_config', []), $config);