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 1f1e3230de14e2fd25853d7d729a7665fa951f1c (commit)
from 2248a91073a7b2f78c3dfdedb628617ec7dd2f23 (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=1f1e3230de14e2fd25853d7d729a7665fa951f1c
commit 1f1e3230de14e2fd25853d7d729a7665fa951f1c
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Jun 16 12:15:03 2016 +0200
Use __construct
diff --git a/src/www/trove/TroveCategory.class.php
b/src/www/trove/TroveCategory.class.php
index 3f1db59..d28457d 100644
--- a/src/www/trove/TroveCategory.class.php
+++ b/src/www/trove/TroveCategory.class.php
@@ -49,13 +49,10 @@ class TroveCategory extends FFError {
var $filter;
/**
- * Constructor.
- *
* @param bool|int $categoryId
The trove_cat_id.
* @param bool|array $dataArray The associative
array of data.
- * @return bool success.
*/
- function TroveCategory($categoryId = false, $dataArray = false) {
+ function __construct($categoryId = false, $dataArray = false) {
if ($categoryId) {
$this->categoryId = $categoryId;
if (!$dataArray || !is_array($dataArray)) {
diff --git a/src/www/trove/TroveCategoryAdmin.class.php
b/src/www/trove/TroveCategoryAdmin.class.php
index 51656c9..9bc86ca 100644
--- a/src/www/trove/TroveCategoryAdmin.class.php
+++ b/src/www/trove/TroveCategoryAdmin.class.php
@@ -2,7 +2,7 @@
class TroveCategoryAdmin extends TroveCategory {
-function TroveCategoryAdmin() {
+function __construct() {
// access management
diff --git a/src/www/trove/TroveCategoryLabel.class.php
b/src/www/trove/TroveCategoryLabel.class.php
index e8c3ddd..6789680 100644
--- a/src/www/trove/TroveCategoryLabel.class.php
+++ b/src/www/trove/TroveCategoryLabel.class.php
@@ -37,13 +37,13 @@ class TroveCategoryLabel extends FFError {
var $category;
var $dataArray = false;
- function TroveCategoryLabel(& $category, $labelId = false, $dataArray =
false) {
+ function __construct(& $category, $labelId = false, $dataArray = false)
{
parent::__construct();
if (!$category || !is_object($category)) {
- return false;
+ return;
}
if ($category->isError()) {
- return false;
+ return;
}
$this->category =& $category;
@@ -51,18 +51,14 @@ class TroveCategoryLabel extends FFError {
$this->labelId = $labelId;
if (!$dataArray || !is_array($dataArray)) {
if (!$this->fetchData($labelId)) {
- return false;
}
} else {
$this->dataArray =& $dataArray;
if ($this->dataArray['category_id'] !=
$this->category->getID()) {
$this->dataArray = null;
- return false;
}
}
}
-
- return true;
}
function create($label, $languageId) {
-----------------------------------------------------------------------
Summary of changes:
src/www/trove/TroveCategory.class.php | 5 +----
src/www/trove/TroveCategoryAdmin.class.php | 2 +-
src/www/trove/TroveCategoryLabel.class.php | 10 +++-------
3 files changed, 5 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
