aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-03 22:55:01 -0800
committerfriendica <info@friendica.com>2015-02-03 22:55:01 -0800
commit0cc29af6d0c305efa35fbe3b0c7bc314f21b4166 (patch)
tree73577a93b6987b539d70cbc46ad6da146e99b19d
parent4ead2cd79d3c7e5c29a11785a3ceefef6d3ba93f (diff)
downloadvolse-hubzilla-0cc29af6d0c305efa35fbe3b0c7bc314f21b4166.tar.gz
volse-hubzilla-0cc29af6d0c305efa35fbe3b0c7bc314f21b4166.tar.bz2
volse-hubzilla-0cc29af6d0c305efa35fbe3b0c7bc314f21b4166.zip
order ratings friends first
-rw-r--r--include/conversation.php4
-rw-r--r--mod/ratings.php18
-rw-r--r--mod/ratingsearch.php2
3 files changed, 18 insertions, 6 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 9429af754..952d7d322 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -619,10 +619,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$profile_link = zid($profile_link);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- if(x($a->contacts,$normalised))
- $profile_avatar = $a->contacts[$normalised]['thumb'];
- else
- $profile_avatar = ((strlen($item['author-avatar'])) ? $a->get_cached_avatar_image($item['author-avatar']) : $item['thumb']);
$profile_name = $item['author']['xchan_name'];
$profile_link = $item['author']['xchan_url'];
diff --git a/mod/ratings.php b/mod/ratings.php
index 4b94f0e52..66392fe2b 100644
--- a/mod/ratings.php
+++ b/mod/ratings.php
@@ -8,6 +8,9 @@ function ratings_init(&$a) {
return;
}
+ if(local_channel())
+ load_contact_links(local_channel());
+
$dirmode = intval(get_config('system','directory_mode'));
$x = find_upstream_directory($dirmode);
@@ -46,7 +49,20 @@ function ratings_init(&$a) {
}
$a->poi = $results['target'];
- $a->data = $results['ratings'];
+
+ $friends = array();
+ $others = array();
+
+ if($results['ratings']) {
+ foreach($results['ratings'] as $n) {
+ if(array_key_exists($n['xchan_hash'],$a->contacts))
+ $friends[] = $n;
+ else
+ $others[] = $n;
+ }
+ }
+
+ $a->data = array_merge($friends,$others);
if(! $a->data) {
notice( t('No ratings') . EOL);
diff --git a/mod/ratingsearch.php b/mod/ratingsearch.php
index 9a537bf97..ec2db570b 100644
--- a/mod/ratingsearch.php
+++ b/mod/ratingsearch.php
@@ -42,7 +42,7 @@ function ratingsearch_init(&$a) {
$ret['success'] = true;
$r = q("select * from xlink left join xchan on xlink_xchan = xchan_hash
- where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1",
+ where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 order by xchan_name asc",
dbesc($p[0]['xchan_hash'])
);