diff options
| author | friendica <info@friendica.com> | 2014-01-18 21:46:16 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-18 21:46:16 -0800 |
| commit | 3f7032e542e3c451507fc9266ab3536155c8190f (patch) | |
| tree | 62c0842da5da6d30b2ad8bc77a1f1bc55e423cc2 /include | |
| parent | db67f08d3c3ae3925479844e0f9b25bab13dabdc (diff) | |
| parent | 331609cb871517bd35416669492488a3bc14702d (diff) | |
| download | volse-hubzilla-3f7032e542e3c451507fc9266ab3536155c8190f.tar.gz volse-hubzilla-3f7032e542e3c451507fc9266ab3536155c8190f.tar.bz2 volse-hubzilla-3f7032e542e3c451507fc9266ab3536155c8190f.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | include/reddav.php | 7 | ||||
| -rw-r--r-- | include/session.php | 9 | ||||
| -rw-r--r-- | include/widgets.php | 1 |
4 files changed, 16 insertions, 3 deletions
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()); } |