pull/3/merge
Jens Mönig 2015-02-24 06:47:12 +01:00
rodzic d3758bd707
commit 85388f1939
2 zmienionych plików z 10 dodań i 2 usunięć

Wyświetl plik

@ -2447,3 +2447,7 @@ ______
* Blocks, Objects: Add user-interaction choices to the “When I am ...” hat block
* Update German translation
* Store: Avoid incompatibility warning for very old (pre-earmarked) projects
150224
------
* Store: fixed #725

Wyświetl plik

@ -61,7 +61,7 @@ SyntaxElementMorph, Variable*/
// Global stuff ////////////////////////////////////////////////////////
modules.store = '2015-February-23';
modules.store = '2015-February-24';
// XML_Serializer ///////////////////////////////////////////////////////
@ -977,7 +977,11 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter) {
);
}
if (!receiver) {
return this.obsoleteBlock(isReporter);
if (!isGlobal) {
receiver = this.project.stage;
} else {
return this.obsoleteBlock(isReporter);
}
}
if (isGlobal) {
info = detect(receiver.globalBlocks, function (block) {