harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	mod/profiles.php
This commit is contained in:
friendica
2015-01-13 18:07:49 -08:00
parent e528483d81 47a2668b30
commit 111bbe65d9
9 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/identity.php
+1 -13
View File
@@ -1205,21 +1205,9 @@ function advanced_profile(&$a) {
if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
// Support tags in the other channels field (probably want to restrict it to channels only?)
$txt = $a->profile['channels'];
$matches = get_tags($txt);
$access_tag = '';
$str_tags = '';
foreach($matches as $m) {
$success = handle_tag($a, $txt, $access_tag, $str_tags, $a->profile_uid, $m); // Use uid of the profile maker
}
if($txt = prepare_text($txt)) {
$profile['channels'] = array( t('My other channels:'), $txt);
}
if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
include/text.php
+1 -1
View File
@@ -2351,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
}
function linkify_tags($a, &$body, $uid, $profile_uid) {
function linkify_tags($a, &$body, $uid) {
$str_tags = '';
$tagged = array();
$result = array();