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

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);

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 {
     }
 
 
-}
+}

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);
+	}
 }
 
 

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());
 }