[Fusionforge-commits] FusionForge branch master updated. 6.0.4-516-gcb95b37

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Mon Jun 13 10:39:48 CEST 2016


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  cb95b3735e04642718736e0cc75d144b063fb3f8 (commit)
       via  9bbf05fde0b0fc0e8c89a80e69e1ec2d8bffef06 (commit)
      from  9bebaea75cd826722cc8fed258ecc331d43712ba (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cb95b3735e04642718736e0cc75d144b063fb3f8

commit cb95b3735e04642718736e0cc75d144b063fb3f8
Merge: 9bbf05f 9bebaea
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jun 13 10:39:20 2016 +0200

    Merge branch 'master' of git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge


https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9bbf05fde0b0fc0e8c89a80e69e1ec2d8bffef06

commit 9bbf05fde0b0fc0e8c89a80e69e1ec2d8bffef06
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jun 13 10:39:02 2016 +0200

    It's called __construct, no need to say it's a constructor

diff --git a/src/common/forum/ForumFactory.class.php b/src/common/forum/ForumFactory.class.php
index 1da8c9ec..7d72abe 100644
--- a/src/common/forum/ForumFactory.class.php
+++ b/src/common/forum/ForumFactory.class.php
@@ -42,8 +42,6 @@ class ForumFactory extends FFError {
 	var $forums;
 
 	/**
-	 * Constructor.
-	 *
 	 * @param	object	$Group	The Group object to which this forum is associated.
 	 */
 	function __construct(&$Group, $skip_check=false) {
diff --git a/src/plugins/admssw/include/admsswPlugin.class.php b/src/plugins/admssw/include/admsswPlugin.class.php
index 9b77fae..445b566 100644
--- a/src/plugins/admssw/include/admsswPlugin.class.php
+++ b/src/plugins/admssw/include/admsswPlugin.class.php
@@ -41,8 +41,6 @@ class admsswPlugin extends Plugin {
 	var $trovecat_id_to_path; // cat_id to path
 
 	/**
-	 * Constructor
-	 *
 	 * @param number $id plugin identifier
 	 */
 	public function __construct($id=0) {
diff --git a/src/plugins/compactpreview/include/CompactResource.class.php b/src/plugins/compactpreview/include/CompactResource.class.php
index 86b8c8e..64f7966 100644
--- a/src/plugins/compactpreview/include/CompactResource.class.php
+++ b/src/plugins/compactpreview/include/CompactResource.class.php
@@ -31,7 +31,6 @@ class CompactResource {
 	public $params;
 
 	/**
-	 * Constructor
 	 * @param unknown_type $params
 	 */
 	public function __construct($params) {
diff --git a/src/plugins/oauthconsumer/include/resource_api.php b/src/plugins/oauthconsumer/include/resource_api.php
index c103b18..f5c9356 100644
--- a/src/plugins/oauthconsumer/include/resource_api.php
+++ b/src/plugins/oauthconsumer/include/resource_api.php
@@ -60,15 +60,12 @@ class OAuthTransaction {
 	protected $request; //an OAuthRequest object
 
 	/**
-	* Constructor
-	*
-	* @param OAuthProvider $provider
-	* @param OAuthAccessToken $access_token
-	* @param OAuthResource $resource
-	* @param array $post_data (should be in the form of an array)
-	* @param boolean $json
-	*
-	*/
+	 * @param OAuthProvider $provider
+	 * @param OAuthAccessToken $access_token
+	 * @param OAuthResource $resource
+	 * @param array $post_data (should be in the form of an array)
+	 * @param boolean $json
+	 */
 	function __construct($provider, $access_token, $resource, $post_data=NULL)	{
 		$this->consumer = new OAuthConsumer($provider->get_consumer_key(), $provider->get_consumer_secret());
 		$this->token = new OAuthToken($access_token->get_token_key(), $access_token->get_token_secret());
diff --git a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
index 02c4878..5579018 100644
--- a/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
+++ b/src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php
@@ -30,8 +30,6 @@ class WikiHtmlSearchRenderer extends HtmlGroupSearchRenderer {
 	var $groupId;
 
     /**
-     * Constructor
-     *
      * @param string $words words we are searching for
      * @param int $offset offset
      * @param bool $isExact if we want to search for all the words or if only one matching the query is sufficient

-----------------------------------------------------------------------

Summary of changes:
 src/common/forum/ForumFactory.class.php                   |  2 --
 src/plugins/admssw/include/admsswPlugin.class.php         |  2 --
 .../compactpreview/include/CompactResource.class.php      |  1 -
 src/plugins/oauthconsumer/include/resource_api.php        | 15 ++++++---------
 src/plugins/wiki/common/WikiHtmlSearchRenderer.class.php  |  2 --
 5 files changed, 6 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list