tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1' into 4.2

Browse Source
This commit is contained in:
Robbie Averill 2018-08-27 16:14:24 +12:00
commit 37a266f2f0
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Control/CLIRequestBuilder.php
View File

@ -2,6 +2,8 @@
namespace SilverStripe\Control; namespace SilverStripe\Control;
use SilverStripe\Core\Environment;
/** /**
* CLI specific request building logic * CLI specific request building logic
*/ */
@ -66,4 +68,19 @@ class CLIRequestBuilder extends HTTPRequestBuilder
// Parse rest of variables as standard // Parse rest of variables as standard
return parent::cleanEnvironment($variables); return parent::cleanEnvironment($variables);
} }
/**
* @param array $variables
* @param string $input
* @return HTTPRequest
*/
public static function createFromVariables(array $variables, $input, $url = null)
{
$request = parent::createFromVariables($variables, $input, $url);
// unset scheme so that SS_BASE_URL can provide `is_https` information if required
$scheme = parse_url(Environment::getEnv('SS_BASE_URL'), PHP_URL_SCHEME);
$request->setScheme($scheme);
return $request;
}
} }

6
src/Control/Email/Email.php
View File

@ -790,6 +790,9 @@ class Email extends ViewableData
return $this; return $this;
} }
// Do not interfere with emails styles
Requirements::clear();
// Render plain part // Render plain part
if ($plainTemplate && !$plainPart) { if ($plainTemplate && !$plainPart) {
$plainPart = $this->renderWith($plainTemplate, $this->getData()); $plainPart = $this->renderWith($plainTemplate, $this->getData());
@ -806,6 +809,9 @@ class Email extends ViewableData
$htmlPartObject = DBField::create_field('HTMLFragment', $htmlPart); $htmlPartObject = DBField::create_field('HTMLFragment', $htmlPart);
$plainPart = $htmlPartObject->Plain(); $plainPart = $htmlPartObject->Plain();
} }
// Rendering is finished
Requirements::restore();
// Fail if no email to send // Fail if no email to send
if (!$plainPart && !$htmlPart) { if (!$plainPart && !$htmlPart) {