Move all usage of versioned_static to media methods

wagtail/admin/staticfiles.py

@@ -41,11 +41,11 @@ def versioned_static(path):
     Wrapper for Django's static file finder to append a cache-busting query parameter
     that updates on each Wagtail version
     """
-    base_url = static(path)
-
-    # if URL already contains a querystring, don't add our own, to avoid interfering
-    # with existing mechanisms
-    if VERSION_HASH is None or '?' in base_url:
-        return base_url
+    # if URL already contains a querystring or is an absolute path, then don't add the version
+    # querystring to avoid changing URLs which might interfere with existing mechanisms, or
+    # doesn't need cache-busting anyway
+    if VERSION_HASH is None or '?' in path or path.startswith(('http://', 'https://', '/')):
+        return path
     else:
+        base_url = static(path)
         return base_url + '?v=' + VERSION_HASH

wagtail/admin/tests/test_templatetags.py

@@ -66,3 +66,15 @@ class TestVersionedStatic(TestCase):
     def test_versioned_static(self):
         result = versioned_static('wagtailadmin/js/core.js')
         self.assertRegex(result, r'^/static/wagtailadmin/js/core.js\?v=(\w+)$')
+
+    def test_versioned_static_querystring(self):
+        result = versioned_static('wagtailadmin/js/core.js?version=1')
+        self.assertEqual(result, 'wagtailadmin/js/core.js?version=1')
+
+    def test_versioned_static_absolute_path(self):
+        result = versioned_static('/static/wagtailadmin/js/core.js')
+        self.assertEqual(result, '/static/wagtailadmin/js/core.js')
+
+    def test_versioned_static_url(self):
+        result = versioned_static('http://example.org/static/wagtailadmin/js/core.js')
+        self.assertEqual(result, 'http://example.org/static/wagtailadmin/js/core.js')