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

2014-05-29 11:05:18 -05:00
parent c278d7156a 91d6834f0e
commit 169f7589f2
1 changed files with 7 additions and 0 deletions
@@ -307,6 +307,13 @@ def URL(
        # if the url gets a static resource, don't force extention
        if controller == 'static':
            extension = None
+            # add static version to url
+            from globals import current
+            if hasattr(current, 'response'):
+                response = current.response
+                if response.static_version and response.static_version_urls:
+                    args = [function] + args
+                    function = '_'+str(response.static_version)

        if '.' in function:
            function, extension = function.rsplit('.', 1)