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

Merge branch '3.2' into 3.3

Browse Source
This commit is contained in:
Daniel Hensby 2016-05-04 23:17:36 +01:00
commit 32f0a637b4
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
2 changed files with 5 additions and 2 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

@ -1451,10 +1451,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.