diff --git a/boot.php b/boot.php index 576872153..912e237e9 100644 --- a/boot.php +++ b/boot.php @@ -17,7 +17,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica Red'); define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1036 ); +define ( 'DB_UPDATE_VERSION', 1037 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index c321af401..138213fbd 100644 --- a/install/database.sql +++ b/install/database.sql @@ -698,6 +698,7 @@ CREATE TABLE IF NOT EXISTS `profile` ( `work` text NOT NULL, `education` text NOT NULL, `contact` text NOT NULL, + `channels` text NOT NULL, `homepage` char(255) NOT NULL, `photo` char(255) NOT NULL, `thumb` char(255) NOT NULL, diff --git a/install/update.php b/install/update.php index 0c7c6e0df..533fd63e5 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ t('Tell us about yourself...'), '$lbl_hobbies' => t('Hobbies/Interests'), '$lbl_social' => t('Contact information and Social Networks'), + '$lbl_channels' => t('My other channels'), '$lbl_music' => t('Musical interests'), '$lbl_book' => t('Books, literature'), '$lbl_tv' => t('Television'), @@ -593,7 +597,8 @@ function profiles_content(&$a) { '$romance' => $r[0]['romance'], '$work' => $r[0]['work'], '$education' => $r[0]['education'], - '$contact' => $r[0]['contact'] + '$contact' => $r[0]['contact'], + '$channels' => $r[0]['channels'], )); $arr = array('profile' => $r[0], 'entry' => $o); diff --git a/mod/settings.php b/mod/settings.php index da6cf709c..54e96d118 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -500,9 +500,10 @@ function settings_post(&$a) { ); */ - $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", + $r = q("update channel set channel_name = '%s', channel_timezone = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d where channel_id = %d limit 1", dbesc($username), dbesc($timezone), + intval($notify), intval($unkmail), intval($maxreq), intval($expire), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e8bd8a18..e011d6185 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -2,7 +2,8 @@ // This needs changing now, if we're going for global settings. Admin settings have been removed in preparation, You *should* just be able to remove all // the get_config bits, though this is untested. // We also need to eventually. Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like. - + load_pconfig(local_user(),'redbasic'); + $line_height = false; $redbasic_font_size = false; $resolution = false; diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7b11c3794..e97064d5f 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -58,6 +58,9 @@ {{ endif }} + {{ if $nav.register }}
  • {{ endif }} + + {{ if $nav.messages }}
  • {{/if}} + {{if $nav.register}}
  • {{/if}} + + {{if $nav.messages}}