Merge branch '0.9.x' into 1.0.x

Conflicts:
	README
	lib/default.php

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/util.php b/lib/util.php
index 85d7c72f4..1d7cffe41 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -875,7 +875,8 @@ function common_linkify($url) {
             $longurl = $url;
         }
     }
-    $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
+
+    $attrs = array('href' => $canon, 'title' => $longurl);
 
     $is_attachment = false;
     $attachment_id = null;
@@ -911,6 +912,16 @@ function common_linkify($url) {
         $attrs['id'] = "attachment-{$attachment_id}";
     }
 
+    // Whether to nofollow
+
+    $nf = common_config('nofollow', 'external');
+
+    if ($nf == 'never') {
+        $attrs['rel'] = 'external';
+    } else {
+        $attrs['rel'] = 'nofollow external';
+    }
+
     return XMLStringer::estring('a', $attrs, $url);
 }