[Fusionforge-commits] FusionForge branch master updated. 9398766146b16683a0fe82dcd6a106319e14ce75
Franck Villaume
nerville at fusionforge.org
Fri Nov 14 10:49:22 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 9398766146b16683a0fe82dcd6a106319e14ce75 (commit)
via b4517767dbbce4417f81b4bebf22f1ecc325aa93 (commit)
from 4654f970238b4c68ec9e0e2cc3cf07115092f102 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9398766146b16683a0fe82dcd6a106319e14ce75
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 14 10:48:00 2014 +0100
use proper config ini value: sys_show_contact_info is now deprecated and replaced by user_display_contact_info in defaults.ini file
diff --git a/src/etc/config.ini.d/defaults.ini b/src/etc/config.ini.d/defaults.ini
index 00f16bb..05b8fdc 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -85,6 +85,7 @@ sitestats_projects_count = visible
allow_project_without_template = yes
use_webdav = no
user_default_shell = "/bin/bash"
+user_display_contact_info = yes
scm_single_host = yes
system_user=fusionforge
diff --git a/src/www/include/user_profile.php b/src/www/include/user_profile.php
index 8df89c3..d95de57 100644
--- a/src/www/include/user_profile.php
+++ b/src/www/include/user_profile.php
@@ -28,13 +28,12 @@
/**
* Display user's profile / personal info either in compact or extensive way
*
-* @param object $user
-* @param bool $compact
-* @param string|bool $title
-* @return string HTML
+* @param object $user
+* @param bool $compact
+* @param string|bool $title
+* @return string HTML
*/
function user_personal_information($user, $compact = false, $title = false) {
-
$user_id = $user->getID();
$user_logo = false;
@@ -102,7 +101,7 @@ function user_personal_information($user, $compact = false, $title = false) {
</td>
</tr>';
if (!$compact) {
- if(!isset($GLOBALS['sys_show_contact_info']) || $GLOBALS['sys_show_contact_info']) {
+ if(forge_get_config('user_display_contact_info')) {
$user_mail=$user->getEmail();
$user_mailsha1=$user->getSha1Email();
diff --git a/tests/code/deprecations/DeprecationsTest.php b/tests/code/deprecations/DeprecationsTest.php
index ec2fdb7..ac2187f 100644
--- a/tests/code/deprecations/DeprecationsTest.php
+++ b/tests/code/deprecations/DeprecationsTest.php
@@ -130,6 +130,7 @@ class Deprecations_Tests extends PHPUnit_Framework_TestCase
'sys_share_path',
'sys_var_path',
'sys_etc_path',
+ 'sys_show_contact_info'
) ;
$pattern = implode ('|', $vars) ;
commit b4517767dbbce4417f81b4bebf22f1ecc325aa93
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Nov 13 12:03:29 2014 +0100
plugin compactpreview: remove useless hook
diff --git a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
index a4c979d..3924432 100644
--- a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
+++ b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
@@ -33,7 +33,6 @@ _("This plugin adds support for user and project compact-preview
$this->_addHook("user_link_with_tooltip"); // override the way user links are done (for user compact preview support)
$this->_addHook("project_link_with_tooltip");
$this->_addHook("javascript_file"); // Add js files for oslc plugin
- $this->_addHook("javascript"); // Add js initialization code
$this->_addHook("cssfile");
$this->_addHook("script_accepted_types");
$this->_addHook("content_negociated_user_home");
-----------------------------------------------------------------------
Summary of changes:
src/etc/config.ini.d/defaults.ini | 1 +
.../compactpreview/include/CompactPreviewPlugin.class.php | 1 -
src/www/include/user_profile.php | 11 +++++------
tests/code/deprecations/DeprecationsTest.php | 1 +
4 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list