From 810e69ef0a88a959ce9f5358377cdc1c7d4bd53a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 20 Mar 2012 19:06:26 -0700
Subject: more friend suggestions

---
 include/socgraph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/socgraph.php b/include/socgraph.php
index 79d7340a4..b2f545509 100755
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -230,7 +230,7 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
 
 
-function suggestion_query($uid, $start = 0, $limit = 40) {
+function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	if(! $uid)
 		return array();
-- 
cgit v1.2.3


From 6c7b619b34e60f391087c669732b9efd0344d41c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 20 Mar 2012 23:57:33 -0700
Subject: remove stray template variable from old code

---
 include/conversation.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index e9f024c27..5de4fcb51 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -897,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$audurl' => t("Please enter an audio link/URL:"),
 		'$term' => t('Tag term:'),
 		'$fileas' => t('File as:'),
-		'$whereareu' => t('Where are you right now?'),
-		'$title' => t('Enter a title for this item') 
+		'$whereareu' => t('Where are you right now?')
 	));
 
 
-- 
cgit v1.2.3


From d81256d7b051d9a76b087feeb64ac79fb4aeff4d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 21 Mar 2012 21:45:45 -0700
Subject: support lowercase :-p smilie

---
 include/text.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/text.php b/include/text.php
index 527f3a344..92a74eb49 100644
--- a/include/text.php
+++ b/include/text.php
@@ -712,6 +712,7 @@ function smilies($s, $sample = false) {
 		';-)', 
 		':-(', 
 		':-P', 
+		':-p', 
 		':-"', 
 		':-&quot;', 
 		':-x', 
@@ -745,6 +746,7 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-\"" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" />',
-- 
cgit v1.2.3