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.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2018-01-15 16:44:48 +00:00
commit bb90751cc8
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 2 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

@ -73,7 +73,7 @@ jQuery.noConflict();
$(window).on("message", function(e) {
var target,
event = e.originalEvent,
data = typeof event.data === 'object' ? event.data : JSON.parse(event.data);
data = typeof event.data === 'object' ? event.data : event.data ? JSON.parse(event.data) : {};
// Reject messages outside of the same origin
if($.path.parseUrl(window.location.href).domain !== $.path.parseUrl(event.origin).domain) return;

2
core/Object.php
View File

@ -949,7 +949,7 @@ abstract class Object {
protected function createMethod($method, $code) {
self::$extra_methods[get_class($this)][strtolower($method)] = array (
'function' => function($obj, $args) use ($code) {
eval($code);
return eval($code);
}
);
}