diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7d0394473..337952235 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - Made CS related upgrades more fault tollerant.
  - Made slave handling more fault tollerant, and slightly higher performing.
  - fix: EXPORT- Exporting Files (PDFs, docs, and some pages)
+ - fix: Linking Pages
  - Enhanced HTTP caching directives.
  - fix: Fixing bad link on the Event page to the search engine. Added a new
    Event template variable called urlSearch to handle it.  (perlDreamer Consulting, LLC)
diff --git a/www/extras/tinymce2/jscripts/webgui.js b/www/extras/tinymce2/jscripts/webgui.js
index f9c15d7f0..acc78044a 100644
--- a/www/extras/tinymce2/jscripts/webgui.js
+++ b/www/extras/tinymce2/jscripts/webgui.js
@@ -3,14 +3,16 @@
 function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
         url = tinyMCE.convertURL(url, node, on_save);
         // Do custom WebGUI convertion, replace back ^();
+
+	// turn escaped macro characters back into the real thing
         url = url.replace(new RegExp("%5E", "g"), "^");
         url = url.replace(new RegExp("%3B", "g"), ";");
         url = url.replace(new RegExp("%28", "g"), "(");
         url = url.replace(new RegExp("%29", "g"), ")");
-	url = url.replace(/^\/\^/,"^");
-	url = url.replace(/http:\/\/\//,"/");
-	url = url.replace(/^.*(\^\/\;.*)$/,"$1");
-	url = url.replace(/^.*(\^FileUrl\(.*\)\;.*)$/,"$1");
+
+	// if there is a macro in the line, remove everythiing in front of the macro
+	url = url.replace(/^.*(\^.*)$/,"$1");
+
         return url;
 }