Merge branch 'master' of github.com:web2py/web2py

gluon/compileapp.py

@@ -652,7 +652,7 @@ def run_view_in(environment):
     """
     request = current.request
     response = current.response
-    view = response.view
+    view = environment['response'].view
     folder = request.folder
     path = pjoin(folder, 'compiled')
     badv = 'invalid view (%s)' % view

gluon/contrib/websocket_messaging.py

@@ -146,8 +146,8 @@ class TokenHandler(tornado.web.RequestHandler):
 
 class DistributeHandler(tornado.websocket.WebSocketHandler):
    
-   def check_origin(self, origin):
-      return True
+    def check_origin(self, origin):
+        return True
 
     def open(self, params):
         group, token, name = params.split('/') + [None, None]

gluon/globals.py

@@ -1080,6 +1080,7 @@ class Session(Storage):
         if response.session_storage_type == 'file':
             target = recfile.generate(response.session_filename)
             try:
+                self._close(response)
                 os.unlink(target)
             except:
                 pass

gluon/tools.py

@@ -6392,7 +6392,7 @@ class Wiki(object):
             count = db.wiki_tag.wiki_page.count()
             fields = [db.wiki_page.id, db.wiki_page.slug,
                       db.wiki_page.title, db.wiki_page.tags,
-                      db.wiki_page.can_read, db.wiki+page.can_edit]
+                      db.wiki_page.can_read, db.wiki_page.can_edit]
             if preview:
                 fields.append(db.wiki_page.body)
             if query is None: