8 files changed, 50 insertions, 20 deletions
diff --git a/skins/amethyst/main.css b/skins/amethyst/main.css
index 898910c782c9..a48ab4e890e5 100644
--- a/skins/amethyst/main.css
+++ b/skins/amethyst/main.css
@@ -438,7 +438,7 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
-.urlexpansion,
+
 .hiddenStructure {
     display: none;
 }
diff --git a/skins/chick/main.css b/skins/chick/main.css
index a7191b17ab1f..a07ee60a0706 100755
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -309,7 +309,7 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
-.urlexpansion,
+
 .hiddenStructure {
     display: none;
 }
diff --git a/skins/common/IEFixes.js b/skins/common/IEFixes.js
index 2d2ba672bdd8..ec10f1b410aa 100644
--- a/skins/common/IEFixes.js
+++ b/skins/common/IEFixes.js
@@ -74,3 +74,44 @@ function setrelative (nodes) {
         i++;
     }
 }
+
+
+// Expand links for printing
+
+String.prototype.hasClass = function(classWanted)
+{
+    var classArr = this.split(/\s/);
+    for (var i=0; i<classArr.length; i++)
+      if (classArr[i].toLowerCase() == classWanted.toLowerCase()) return true;
+    return false;
+}
+
+var expandedURLs;
+
+onbeforeprint = function() { 
+    expandedURLs = [];
+
+    var contentEl = document.getElementById("content");
+
+    if (contentEl)
+    {
+      var allLinks = contentEl.getElementsByTagName("a");
+
+      for (var i=0; i < allLinks.length; i++) {
+          if (allLinks[i].className.hasClass("external") && !allLinks[i].className.hasClass("free")) {
+              var expandedLink = document.createElement("span");
+              var expandedText = document.createTextNode(" (" + allLinks[i].href + ")");
+              expandedLink.appendChild(expandedText);
+              allLinks[i].parentNode.insertBefore(expandedLink, allLinks[i].nextSibling);
+              expandedURLs[i] = expandedLink;
+          }
+      }
+   }
+}
+
+onafterprint = function()
+{
+    for (var i=0; i < expandedURLs.length; i++)
+        if (expandedURLs[i])
+            expandedURLs[i].removeNode(true);
+}
+\ No newline at end of file
diff --git a/skins/common/common.css b/skins/common/common.css
index 98786846627b..b5bbb9f6b1c7 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -11,7 +11,7 @@ div.floatleft p { font-style: italic; }
 
 
 /* Print-specific things to hide */
-.urlexpansion, .printfooter {
+.printfooter {
         display: none;
 }
 
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 71ae2c8f27d1..8c0aff159905 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -163,11 +163,11 @@ a:link, a:visited {
     background: transparent;
     text-decoration: underline;
 }
-/*
-#content a:link:after, 
-#content a:visited:after {
-   content: " ( " attr(href) " ) ";
-}*/
+
+#content a.external.text:after, #content a.external.autonumber:after {
+    /* Expand URLs for printing */
+    content: " (" attr(href) ") ";
+}
 
 #globalWrapper {
     width: 100% !important;
@@ -198,11 +198,6 @@ img { border: none; }
 img.tex { vertical-align: middle; }
 span.texhtml { font-family: serif; }
 
-/* Show some stuff */
-.urlexpansion {
-	display: inline ! important;
-}
-
 div.townBox {
     position:relative;
     float:right;
diff --git a/skins/common/wikiprintable.css b/skins/common/wikiprintable.css
index 22e71935809b..868b36e089a5 100644
--- a/skins/common/wikiprintable.css
+++ b/skins/common/wikiprintable.css
@@ -32,11 +32,6 @@ a, a.external, a.new, a.stub {
 	margin: inherit ! important;
 }
 
-/* Show some stuff */
-.urlexpansion {
-	display: inline ! important;
-}
-
 .printfooter {
 	border-top: solid 1px black;
 	display: block ! important;
diff --git a/skins/disabled/Chick.php b/skins/disabled/Chick.php
index 205feb67008d..3351576228ec 100644
--- a/skins/disabled/Chick.php
+++ b/skins/disabled/Chick.php
@@ -27,7 +27,6 @@ class SkinChick extends SkinPHPTal {
 		$this->skinname = 'chick';
 		$this->template = 'Chick';
 	}
-	function suppressUrlExpansion() { return true; }
 	function printSource() { return ''; }
 }
 
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index e3e4645b9e15..e14117deac82 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -408,7 +408,7 @@ div.tleft {
     margin-right:0.5em;
     border-width: 0.5em 1.4em 0.8em 0;
 }
-.urlexpansion,
+
 .hiddenStructure {
     display: none;
 }