Merge pull request #2016 from fabrixxm/template_vars_hook

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 9401adccad88f76c4859624b20880af7e5c35272..810671a91cceee3e4ce78a646b56b7ef443a79d3 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,11 +1,12 @@
 <?php
 
-function follow_widget() {
+function follow_widget($value = "") {
 
        return replace_macros(get_markup_template('follow.tpl'),array(
                '$connect' => t('Add New Contact'),
                '$desc' => t('Enter address or web location'),
                '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
+               '$value' => $value,
                '$follow' => t('Connect')
        ));
 
@@ -49,8 +50,8 @@ function networks_widget($baseurl,$selected = '') {
 
        if(! feature_enabled(local_user(),'networks'))
                return '';
-       
-       $r = q("select distinct(network) from contact where uid = %d and self = 0",
+
+       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `self` = 0 ORDER BY `network`",
                intval(local_user())
        );