diff options
| -rw-r--r-- | include/features.php | 1 | ||||
| -rw-r--r-- | include/identity.php | 6 | ||||
| -rwxr-xr-x | install/htconfig.sample.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/cs/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/de/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/en-au/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/en-gb/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/eo/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/fr/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/it/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/nb-no/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/pt-br/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/ru/htconfig.tpl | 1 | ||||
| -rw-r--r-- | view/sv/htconfig.tpl | 1 |
15 files changed, 18 insertions, 4 deletions
diff --git a/include/features.php b/include/features.php index ffa8bf8ca..b18a58ed4 100644 --- a/include/features.php +++ b/include/features.php @@ -49,6 +49,7 @@ function get_features($filtered = true) { array('advanced_profiles', t('Advanced Profiles'), t('Additional profile sections and selections'),false,get_config('feature_lock','advanced_profiles')), array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')), + array('hide_rating', t('Hide Rating'), t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')), array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')), array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')), array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')), diff --git a/include/identity.php b/include/identity.php index 2a02d4093..32c4dd130 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1051,8 +1051,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $tpl = get_markup_template('profile_vcard.tpl'); require_once('include/widgets.php'); - $z = widget_rating(array('target' => $profile['channel_hash'])); + if(! feature_enabled($profile['uid'],'hide_rating')) + $z = widget_rating(array('target' => $profile['channel_hash'])); + $o .= replace_macros($tpl, array( '$profile' => $profile, '$connect' => $connect, @@ -1773,4 +1775,4 @@ function get_cover_photo($channel_id,$format = 'bbcode', $res = PHOTO_RES_COVER_ return $output; -}
\ No newline at end of file +} diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index 21697a951..794afa93b 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -17,7 +17,7 @@ $db_port = 0; // leave 0 for default or set your port $db_user = 'mysqlusername'; $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; - +$db_type = 0; // use 1 for postgres, 0 for mysql /* * Notice: Many of the following settings will be available in the admin panel diff --git a/version.inc b/version.inc index 84bd44ea2..10776afeb 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-17.1281H +2016-01-18.1282H diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index 928694769..205da73a3 100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl index c3bef0de3..9dd0a1ab2 100644 --- a/view/en-au/htconfig.tpl +++ b/view/en-au/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl index c3bef0de3..9dd0a1ab2 100644 --- a/view/en-gb/htconfig.tpl +++ b/view/en-gb/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/eo/htconfig.tpl +++ b/view/eo/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 430d97a47..1e7e14fb4 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -10,6 +10,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/nb-no/htconfig.tpl +++ b/view/nb-no/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/pt-br/htconfig.tpl +++ b/view/pt-br/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/ru/htconfig.tpl +++ b/view/ru/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index cc4087f96..773125154 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -8,6 +8,7 @@ $db_port = '{{$dbport}}'; $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres /* * Notice: Many of the following settings will be available in the admin panel |