From 11df605c2e065e123e58bd73525e7ca2113f40b8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 24 Feb 2015 00:45:03 -0800
Subject: support rel=me on channel "homepage" url

---
 include/identity.php | 2 +-
 include/text.php     | 4 ++--
 version.inc          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 415e85f2f..f63b576b2 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -893,7 +893,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 		|| (x($profile,'country_name') == 1))
 		$location = t('Location:');
 
-	$profile['homepage'] = linkify($profile['homepage']);
+	$profile['homepage'] = linkify($profile['homepage'],true);
 
 	$gender   = ((x($profile,'gender')   == 1) ? t('Gender:')   : False);
 	$marital  = ((x($profile,'marital')  == 1) ? t('Status:')   : False);
diff --git a/include/text.php b/include/text.php
index c93bc4e70..2a524f7f1 100644
--- a/include/text.php
+++ b/include/text.php
@@ -873,8 +873,8 @@ function valid_email($x){
  */
 
 
-function linkify($s) {
-	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+]*)/", ' <a href="$1" >$1</a>', $s);
+function linkify($s,$me = false) {
+	$s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\@\~\#\'\%\$\!\+]*)/", (($me) ? ' <a href="$1" rel="me" >$1</a>' : ' <a href="$1" >$1</a>'), $s);
 	$s = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$s);
 	return($s);
 }
diff --git a/version.inc b/version.inc
index 2e906c260..2a61decf3 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-02-22.952
+2015-02-24.953
-- 
cgit v1.2.3