The attached patch removes an unused setting of the variable $http_protocol and tidies up another use of the variable. No functional changes.

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Status: Needs review » Needs work

The last submitted patch, http_protocol.patch, failed testing.

Liam Morland’s picture

Status: Needs work » Needs review
FileSize
782 bytes
Liam Morland’s picture

FileSize
782 bytes

Updated patch rolled against latest D8.

Liam Morland’s picture

FileSize
782 bytes

Reroll.

Lars Toomre’s picture

Status: Needs review » Reviewed & tested by the community

Looks good to me and passes the bot!

webchick’s picture

Status: Reviewed & tested by the community » Needs work
+++ b/core/includes/bootstrap.incundefined
@@ -743,8 +742,7 @@ function drupal_settings_initialize() {
+    $base_root = ($is_https ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];

While this is technically valid PHP to throw a ternary operation in the middle of a string, it's a little strange compared to what we do elsewhere. I actually find the former code a bit easier to read. :\

I would recommend just a patch to get rid of the bunk variable in the if ($base_url) check alone.

Liam Morland’s picture

Status: Needs work » Needs review
FileSize
450 bytes

OK, see attached.

Cameron Tod’s picture

Status: Needs review » Reviewed & tested by the community

Looks good to me. I was just about to post this exact patch.

Dries’s picture

Status: Reviewed & tested by the community » Fixed

Committed to 8.x. Thanks.

Cameron Tod’s picture

Issue tags: +Novice

Adding tags.

Cameron Tod’s picture

Version: 8.x-dev » 7.x-dev
Status: Fixed » Needs review
FileSize
430 bytes

Here's a quick backport.

Liam Morland’s picture

Status: Needs review » Reviewed & tested by the community

Looks good. Thanks.

xjm’s picture

David_Rothstein’s picture

Status: Reviewed & tested by the community » Fixed

Automatically closed -- issue fixed for 2 weeks with no activity.