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 '3.3' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2016-05-04 23:32:10 +01:00
commit 457931d664
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/javascript/LeftAndMain.js
View File

@ -188,7 +188,7 @@ jQuery.noConflict();
} }
// Show message (but ignore aborted requests) // Show message (but ignore aborted requests)
if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages)) { if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages) === -1) {
// Decode into UTF-8, HTTP headers don't allow multibyte // Decode into UTF-8, HTTP headers don't allow multibyte
statusMessage(decodeURIComponent(msg), msgType); statusMessage(decodeURIComponent(msg), msgType);
} }

5
model/Versioned.php
View File

@ -1478,10 +1478,13 @@ class Versioned extends DataExtension implements TemplateGlobalProvider {
*/ */
public function isLatestVersion() { public function isLatestVersion() {
$version = self::get_latest_version($this->owner->class, $this->owner->ID); $version = self::get_latest_version($this->owner->class, $this->owner->ID);
if($version) {
return ($version->Version == $this->owner->Version); return ($version->Version == $this->owner->Version);
} }
return false;
}
/** /**
* Return the equivalent of a DataList::create() call, querying the latest * Return the equivalent of a DataList::create() call, querying the latest
* version of each page stored in the (class)_versions tables. * version of each page stored in the (class)_versions tables.

9
security/Security.php
View File

@ -275,9 +275,12 @@ class Security extends Controller implements TemplateGlobalProvider {
$form = $me->LoginForm(); $form = $me->LoginForm();
$form->sessionMessage($message, 'warning'); $form->sessionMessage($message, 'warning');
Session::set('MemberLoginForm.force_message',1); Session::set('MemberLoginForm.force_message',1);
$formText = $me->login(); $loginResponse = $me->login();
if($loginResponse instanceof SS_HTTPResponse) {
return $loginResponse;
}
$response->setBody($formText); $response->setBody((string)$loginResponse);
$controller->extend('permissionDenied', $member); $controller->extend('permissionDenied', $member);
@ -502,7 +505,7 @@ class Security extends Controller implements TemplateGlobalProvider {
* For multiple authenticators, Security_MultiAuthenticatorLogin is used. * For multiple authenticators, Security_MultiAuthenticatorLogin is used.
* See getTemplatesFor and getIncludeTemplate for how to override template logic * See getTemplatesFor and getIncludeTemplate for how to override template logic
* *
* @return string Returns the "login" page as HTML code. * @return string|SS_HTTPResponse Returns the "login" page as HTML code.
*/ */
public function login() { public function login() {
// Check pre-login process // Check pre-login process

0
tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml Normal file
View File

3
tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml Normal file
View File

@ -0,0 +1,3 @@
---
Name: emptyconfig
---