Merge branch 'master' of https://github.com/friendica/red

3 files changed, 32 insertions, 14 deletions

diff --git a/mod/directory.php b/mod/directory.php
index b11b0d410..e80e9661d 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -201,18 +201,27 @@ function directory_content(&$a) {
 
 //					logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
 
-					$o .= replace_macros($tpl, array(
-						'$search' => $search,
-						'$desc' => t('Find'),
-						'$finddsc' => t('Finding:'),
-						'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
-						'$entries' => $entries,
-						'$dirlbl' => t('Directory'),
-						'$submit' => t('Find')
-					));
-
-
-					$o .= alt_pager($a,$j['records'], t('next page'), t('previous page'));
+
+					if($dynamic) {
+
+
+					}
+					else {
+
+						$o .= "<script> var page_query_args = '" . $a->query_string . "'; </script>";
+						$o .= replace_macros($tpl, array(
+							'$search' => $search,
+							'$desc' => t('Find'),
+							'$finddsc' => t('Finding:'),
+							'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
+							'$entries' => $entries,
+							'$dirlbl' => t('Directory'),
+							'$submit' => t('Find')
+						));
+
+						$o .= alt_pager($a,$j['records'], t('next page'), t('previous page'));
+
+					}
 
 				}
 				else {
diff --git a/mod/item.php b/mod/item.php
index d4739244a..9d020adaa 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1076,6 +1076,13 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
 			else
 				$newname = str_replace('_',' ',$name);
 
+			// do this bit over since we started over with $name
+
+			if(substr($newname,-1,1) === '+') {
+				$forum = true;
+				$newname = substr($newname,0,-1);
+			}
+
 			//select someone from this user's contacts by name
 			$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash  
 				WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
@@ -1161,6 +1168,8 @@ 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]);
 }
 
diff --git a/mod/profiles.php b/mod/profiles.php
index f6392d4ab..60e7efa1f 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -505,8 +505,8 @@ function profiles_content(&$a) {
 		$o .= replace_macros($tpl,array(
 
 			'$form_security_token' => get_form_security_token("profile_edit"),
-			'$profile_clone_link'  => 'profiles/clone/' . $r[0]['id'] . '?t=' 
-				. get_form_security_token("profile_clone"),
+			'$profile_clone_link'  => ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' 
+				. get_form_security_token("profile_clone") : ''),
 			'$profile_drop_link'   => 'profiles/drop/' . $r[0]['id'] . '?t=' 
 				. get_form_security_token("profile_drop"),