aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-04-16 05:52:10 +0100
committerThomas Willingham <founder@kakste.com>2013-04-16 05:52:10 +0100
commit6e2e8f101a930ec39d3a38ee4aeec5ad3b0c8cf7 (patch)
tree2310e18c878c496047c58385b2ea89308edd63e7
parentdc80dce95e5c94912050c763c1e617e228a80b86 (diff)
downloadvolse-hubzilla-6e2e8f101a930ec39d3a38ee4aeec5ad3b0c8cf7.tar.gz
volse-hubzilla-6e2e8f101a930ec39d3a38ee4aeec5ad3b0c8cf7.tar.bz2
volse-hubzilla-6e2e8f101a930ec39d3a38ee4aeec5ad3b0c8cf7.zip
Uncripple zids.
-rw-r--r--include/features.php2
-rw-r--r--include/text.php12
2 files changed, 12 insertions, 2 deletions
diff --git a/include/features.php b/include/features.php
index 14cf891b3..c2aabbc42 100644
--- a/include/features.php
+++ b/include/features.php
@@ -23,6 +23,8 @@ function get_features() {
array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')),
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')),
array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')),
+ //FIXME - needs a description, but how the hell do we explain this to normals?
+ array('sendzid', t('Extended Identity Sharing'), t(' ')),
array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')),
diff --git a/include/text.php b/include/text.php
index 360a7357f..c7210010c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1128,14 +1128,22 @@ function prepare_text($text,$content_type = 'text/bbcode') {
function zidify_callback($match) {
- $replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';
+ if (feature_enabled(local_user(),'sendzid')) {
+ $replace = '<a' . $match[1] . ' href="' . zid($match[2]) . '"';}
+ else {
+ $replace = '<a' . $match[1] . 'class="zrl"' . $match[2] . ' href="' . zid($match[3]) . '"';}
+
$x = str_replace($match[0],$replace,$match[0]);
return $x;
}
function zidify_links($s) {
- $s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);
+ if (feature_enabled(local_user(),'sendzid')) {
+ $s = preg_replace_callback('/\<a(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
+ else {
+ $s = preg_replace_callback('/\<a(.*?)class\=\"zrl\"(.*?)href\=\"(.*?)\"/ism','zidify_callback',$s);}
+
return $s;
}