tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 12:49:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

Browse Source
This commit is contained in:
Serge Latyntcev 2019-10-18 15:58:13 +13:00
commit 0cf5d4cbe2
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Core/CoreKernel.php
View File

@ -291,18 +291,19 @@ class CoreKernel implements Kernel
// Build error response // Build error response
$dv = new DebugView(); $dv = new DebugView();
$body = $body = implode([
$dv->renderHeader() . $dv->renderHeader(),
$dv->renderInfo( $dv->renderInfo(
"Configuration Error", "Configuration Error",
Director::absoluteBaseURL() Director::absoluteBaseURL()
) . ),
$dv->renderParagraph( $dv->renderParagraph(
'You need to replace your _ss_environment.php file with a .env file, or with environment variables.<br><br>' 'You need to replace your _ss_environment.php file with a .env file, or with environment variables.<br><br>'
. 'See the <a href="https://docs.silverstripe.org/en/4/getting_started/environment_management/">' . 'See the <a href="https://docs.silverstripe.org/en/4/getting_started/environment_management/">'
. 'Environment Management</a> docs for more information.' . 'Environment Management</a> docs for more information.'
) . ),
$dv->renderFooter(); $dv->renderFooter()
]);
// Raise error // Raise error
$response = new HTTPResponse($body, 500); $response = new HTTPResponse($body, 500);

11
src/ORM/DataObject.php
View File

@ -2112,12 +2112,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// If we haven't been written yet, we can't save these relations, so use a list that handles this case // If we haven't been written yet, we can't save these relations, so use a list that handles this case
if (!$id) { if (!$id) {
if (!isset($this->unsavedRelations[$componentName])) { if (!isset($this->unsavedRelations[$componentName])) {
$this->unsavedRelations[$componentName] = $this->unsavedRelations[$componentName] = new UnsavedRelationList(
new UnsavedRelationList( $manyManyComponent['parentClass'],
$manyManyComponent['parentClass'], $componentName,
$componentName, $manyManyComponent['childClass']
$manyManyComponent['childClass'] );
);
} }
return $this->unsavedRelations[$componentName]; return $this->unsavedRelations[$componentName];
} }

14
src/Security/PermissionCheckboxSetField.php
View File

@ -268,15 +268,15 @@ class PermissionCheckboxSetField extends FormField
} }
} }
if ($this->readonly) { if ($this->readonly) {
$message = _t(
'SilverStripe\\Security\\Permission.UserPermissionsIntro',
'Assigning groups to this user will adjust the permissions they have.'
. ' See the groups section for details of permissions on individual groups.'
);
return return
"<ul id=\"{$this->ID()}\" class=\"optionset checkboxsetfield{$this->extraClass()}\">\n" . "<ul id=\"{$this->ID()}\" class=\"optionset checkboxsetfield{$this->extraClass()}\">\n" .
"<li class=\"help\">" . "<li class=\"help\">" . $message . "</li>" .
_t(
'SilverStripe\\Security\\Permission.UserPermissionsIntro',
'Assigning groups to this user will adjust the permissions they have.'
. ' See the groups section for details of permissions on individual groups.'
) .
"</li>" .
$options . $options .
"</ul>\n"; "</ul>\n";
} else { } else {

18
src/includes/constants.php
View File

@ -42,13 +42,17 @@ if (!defined('BASE_PATH')) {
define('BASE_PATH', call_user_func(function () { define('BASE_PATH', call_user_func(function () {
// Determine BASE_PATH based on the composer autoloader // Determine BASE_PATH based on the composer autoloader
foreach (debug_backtrace() as $backtraceItem) { foreach (debug_backtrace() as $backtraceItem) {
if (isset($backtraceItem['file']) if (!isset($backtraceItem['file'])) {
&& preg_match( continue;
'#^(?<base>.*)(/|\\\\)vendor(/|\\\\)composer(/|\\\\)autoload_real.php#', }
$backtraceItem['file'],
$matches $matched = preg_match(
) '#^(?<base>.*)(/|\\\\)vendor(/|\\\\)composer(/|\\\\)autoload_real.php#',
) { $backtraceItem['file'],
$matches
);
if ($matched) {
return realpath($matches['base']) ?: DIRECTORY_SEPARATOR; return realpath($matches['base']) ?: DIRECTORY_SEPARATOR;
} }
} }

6
tests/php/ORM/DataListTest.php
View File

@ -1061,11 +1061,9 @@ class DataListTest extends SapphireTest
->leftJoin( ->leftJoin(
'DataObjectTest_Team', 'DataObjectTest_Team',
'"DataObjectTest_Team"."ID" = "DataObjectTest_TeamComment"."TeamID"' '"DataObjectTest_Team"."ID" = "DataObjectTest_TeamComment"."TeamID"'
)->filter( )->filter([
array(
'Title' => 'Team 1' 'Title' => 'Team 1'
) ]);
);
$this->assertEquals(2, $list->count()); $this->assertEquals(2, $list->count());
$values = $list->column('Name'); $values = $list->column('Name');