Ticket #914: admin_modify.diff

store/django/django/contrib/admin/templatetags/admin_modify.py

@@ -15 +15 @@
 def class_name_to_underscored(name):
     return '_'.join([s.lower() for s in word_re.findall(name)[:-1]])
 
+_URL_PATTERN = re.compile(r'''(?x)((http|https|ftp)://(\w+[:.]?){2,}(/?|[^ \n\r"']+[\w/!?.=#])(?=[\s\.,>)"'\]]))''')
 def include_admin_script(script_path):
     """
     Returns an HTML script element for including a script from the admin
@@ -27 +28 @@
     could return::
 
         <script type="text/javascript" src="/media/admin/js/calendar.js">
+
+    or (if you use absolute path)::
+        
+        {% include_admin_script /myjs/other.js %}
+
+    could return::
+
+        <script type="text/javascript" src="/myjs/other.js">
     """
 
-    return '<script type="text/javascript" src="%s%s"></script>' % (settings.ADMIN_MEDIA_PREFIX, script_path)
+    if _URL_PATTERN.match(script_path) or script_path[0] == '/':
+        return '<script type="text/javascript" src="%s"></script>' % (script_path)
+    else:
+        return '<script type="text/javascript" src="%s%s"></script>' % (settings.ADMIN_MEDIA_PREFIX, script_path)
 include_admin_script = register.simple_tag(include_admin_script)
 
 def submit_row(context):