Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging

Conflicts:
	mod/profiles.php
This commit is contained in:
friendica
2015-01-13 18:07:49 -08:00
9 changed files with 32 additions and 17 deletions

View File

@@ -298,6 +298,23 @@ function profiles_post(&$a) {
$hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0);
require_once('include/text.php');
linkify_tags($a, $likes, local_user());
linkify_tags($a, $dislikes, local_user());
linkify_tags($a, $about, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $interest, local_user());
linkify_tags($a, $contact, local_user());
linkify_tags($a, $channels, local_user());
linkify_tags($a, $music, local_user());
linkify_tags($a, $book, local_user());
linkify_tags($a, $tv, local_user());
linkify_tags($a, $film, local_user());
linkify_tags($a, $romance, local_user());
linkify_tags($a, $work, local_user());
linkify_tags($a, $education, local_user());
$with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');
if(! strlen($howlong))