merge

1 files changed, 8 insertions, 3 deletions

diff --git a/store.js b/store.js
index 7db27a6..b872d0b 100644
--- a/store.js
+++ b/store.js
@@ -61,7 +61,7 @@ SyntaxElementMorph, Variable*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.store = '2015-January-21';
+modules.store = '2015-February-28';
 
 
 // XML_Serializer ///////////////////////////////////////////////////////
@@ -320,7 +320,7 @@ SnapSerializer.prototype.loadProjectModel = function (xmlNode, ide) {
     var appInfo = xmlNode.attributes.app,
         app = appInfo ? appInfo.split(' ')[0] : null;
 
-    if (ide && app !== this.app.split(' ')[0]) {
+    if (ide && app && app !== this.app.split(' ')[0]) {
         ide.inform(
             app + ' Project',
             'This project has been created by a different app:\n\n' +
@@ -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) {
@@ -1023,6 +1027,7 @@ SnapSerializer.prototype.loadBlock = function (model, isReporter) {
             this.loadInput(child, inputs[i], block);
         }
     }, this);
+    block.cachedInputs = null;
     return block;
 };