From fbd4f19d1224715ce1ea35064a07d128a8d35bb8 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 6 Mar 2010 07:28:29 +0000
Subject: - Patch #565808 by cha0s, Dave Reid, Alexander N: fixed nojs/ajax
 replacement.

---
 misc/ajax.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'misc/ajax.js')

diff --git a/misc/ajax.js b/misc/ajax.js
index 016a953ce..785052f7b 100644
--- a/misc/ajax.js
+++ b/misc/ajax.js
@@ -107,7 +107,7 @@ Drupal.ajax = function (base, element, element_settings) {
 
   // Replacing 'nojs' with 'ajax' in the URL allows for an easy method to let
   // the server detect when it needs to degrade gracefully.
-  this.url = element_settings.url.replace(/nojs/g, 'ajax');
+  this.url = element_settings.url.replace(/\/nojs(\/|$)/g, '/ajax$1');
   this.wrapper = '#' + element_settings.wrapper;
 
   // If there isn't a form, jQuery.ajax() will be used instead, allowing us to
-- 
cgit v1.2.3