Merge https://github.com/friendica/red into zpull

6 files changed, 25 insertions, 5 deletions

diff --git a/doc/Install.md b/doc/Install.md
index 389c9d632..2df82b181 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -47,7 +47,7 @@ you might have trouble getting everything to work.]
         
         `mkdir view/tpl/smarty3`
         
-        `chown 777 view/smarty3`
+        `chmod 777 view/smarty3`
     
     - For installing addons
     
@@ -102,4 +102,4 @@ one shown, substituting for your unique paths and settings:
 
 You can generally find the location of PHP by executing "which php". If you
 have troubles with this section please contact your hosting provider for
-assistance. Red will not work correctly if you cannot perform this step.
\ No newline at end of file
+assistance. Red will not work correctly if you cannot perform this step.
diff --git a/include/identity.php b/include/identity.php
index 40a38808b..a99474d42 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -952,6 +952,8 @@ function advanced_profile(&$a) {
 
 		if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
 
+		if($txt = prepare_text($a->profile['channels'])) $profile['channels'] = array( t('My other channels:'), $txt);
+
 		if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
 		
 		if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
diff --git a/include/reddav.php b/include/reddav.php
index c53838297..838ead7b7 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -101,8 +101,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
 
 
 		$c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
-			intval(PAGE_REMOVED),
-			intval($this->auth->owner_id)
+			intval($this->auth->owner_id),
+			intval(PAGE_REMOVED)
+
 		);
 
 		if(! $c) {
@@ -988,4 +989,4 @@ class RedBrowser extends DAV\Browser\Plugin {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/include/session.php b/include/session.php
index 6072bdb33..be1ec5ee7 100644
--- a/include/session.php
+++ b/include/session.php
@@ -15,6 +15,15 @@ function new_cookie($time) {
     session_regenerate_id(false);
 
     q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+
+	if (x($_COOKIE, 'jsAvailable')) {
+		if ($time) {
+			$expires = time() + $time;
+		} else {
+			$expires = 0;
+		}
+		setcookie('jsAvailable', $_COOKIE['jsAvailable'], $expires);
+	}
 }
 
 
diff --git a/include/widgets.php b/include/widgets.php
index a1ff756ff..efa350785 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -549,6 +549,7 @@ function widget_photo_albums($arr) {
 
 
 function widget_vcard($arr) {
+	require_once ('include/Contact.php');
 	return vcard_from_xchan('',get_app()->get_observer());
 }
 
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 9f17a0ffa..f25608430 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -111,6 +111,13 @@
 </dl>
 {{/if}}
 
+{{if $profile.channels}}
+<dl id="aprofile-channels" class="aprofile">
+ <dt>{{$profile.channels.0}}</dt>
+ <dd>{{$profile.channels.1}}</dd>
+</dl>
+{{/if}}
+
 
 {{if $profile.music}}
 <dl id="aprofile-music" class="aprofile">