Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in...

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 06b85045001a5bcd41ca19cf6e1ed397d36e581f..b715fc3eed78df3d33e93ad698b274d75b623b61 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -288,7 +288,7 @@ function profiles_post(&$a) {
 
                $sexual = notags(trim($_POST['sexual']));
                $homepage = notags(trim($_POST['homepage']));
-               if (strpos($homepage, 'http') !== 0) {
+               if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) {
                    // neither http nor https in URL, add them
                    $homepage = 'http://'.$homepage;
                }
@@ -558,10 +558,10 @@ function profile_activity($changed, $value) {
        if($i) {
 
                // give it a permanent link
-               q("update item set plink = '%s' where id = %d",
-                       dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
-                       intval($i)
-               );
+               //q("update item set plink = '%s' where id = %d",
+               //      dbesc($a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $i),
+               //      intval($i)
+               //);
 
                proc_run('php',"include/notifier.php","activity","$i");
 
@@ -610,6 +610,13 @@ function profiles_content(&$a) {
 
                $opt_tpl = get_markup_template("profile-hide-friends.tpl");
                $hide_friends = replace_macros($opt_tpl,array(
+                       '$yesno' => array(
+                               'hide-friends', //Name
+                               t('Hide contacts and friends:'), //Label
+                               !!$r[0]['hide-friends'], //Value
+                               '', //Help string
+                               array(t('No'),t('Yes')) //Off - On strings
+                       ),
                        '$desc' => t('Hide your contact/friend list from viewers of this profile?'),
                        '$yes_str' => t('Yes'),
                        '$no_str' => t('No'),
@@ -627,6 +634,7 @@ function profiles_content(&$a) {
                $is_default = (($r[0]['is-default']) ? 1 : 0);
                $tpl = get_markup_template("profile_edit.tpl");
                $o .= replace_macros($tpl,array(
+                       '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'),
                        '$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_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),