|
From: <rgr...@us...> - 2014-01-17 05:37:07
|
Revision: 12264
http://sourceforge.net/p/xoops/svn/12264
Author: rgriffith
Date: 2014-01-17 05:37:05 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
Fix errors "PHP Strict standards: Redefining already defined constructor" under PHP 5.5
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php 2014-01-17 02:55:28 UTC (rev 12263)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/category.php 2014-01-17 05:37:05 UTC (rev 12264)
@@ -34,11 +34,6 @@
$this->initVar('cat_weight', XOBJ_DTYPE_INT);
}
- function ProfileCategory()
- {
- $this->__construct();
- }
-
/**
* Get {@link XoopsThemeForm} for adding/editing categories
*
@@ -77,11 +72,6 @@
*/
class ProfileCategoryHandler extends XoopsPersistableObjectHandler
{
- function ProfileCategoryHandler(&$db)
- {
- $this->__construct($db);
- }
-
function __construct(&$db)
{
parent::__construct($db, "profile_category", "profilecategory", "cat_id", 'cat_title');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php 2014-01-17 02:55:28 UTC (rev 12263)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/field.php 2014-01-17 05:37:05 UTC (rev 12264)
@@ -47,11 +47,6 @@
$this->initVar('step_id', XOBJ_DTYPE_INT, 0);
}
- function ProfileField()
- {
- $this->__construct();
- }
-
/**
* Extra treatment dealing with non latin encoding
* Tricky solution
@@ -414,11 +409,6 @@
*/
class ProfileFieldHandler extends XoopsPersistableObjectHandler
{
- function ProfileFieldHandler(&$db)
- {
- $this->__construct($db);
- }
-
function __construct(&$db)
{
parent::__construct($db, 'profile_field', "profilefield", "field_id", 'field_title');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php 2014-01-17 02:55:28 UTC (rev 12263)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/profile.php 2014-01-17 05:37:05 UTC (rev 12264)
@@ -32,11 +32,6 @@
$this->init($fields);
}
- function ProfileProfile($fields)
- {
- $this->__construct($fields);
- }
-
/**
* Initiate variables
* @param array $fields field information array of {@link XoopsProfileField} objects
@@ -67,11 +62,6 @@
*/
var $_fields = array();
- function ProfileProfileHandler(&$db)
- {
- $this->__construct($db);
- }
-
function __construct(&$db)
{
parent::__construct($db, "profile_profile", 'profileprofile', "profile_id");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php 2014-01-17 02:55:28 UTC (rev 12263)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/regstep.php 2014-01-17 05:37:05 UTC (rev 12264)
@@ -30,20 +30,10 @@
$this->initVar('step_order', XOBJ_DTYPE_INT, 1);
$this->initVar('step_save', XOBJ_DTYPE_INT, 0);
}
-
- function ProfileRegstep()
- {
- $this->__construct();
- }
}
class ProfileRegstepHandler extends XoopsPersistableObjectHandler
{
- function ProfileRegstepHandler(&$db)
- {
- $this->__construct($db);
- }
-
function __construct($db)
{
parent::__construct($db, 'profile_regstep', 'profileregstep', 'step_id', 'step_name');
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php 2014-01-17 02:55:28 UTC (rev 12263)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/profile/class/visibility.php 2014-01-17 05:37:05 UTC (rev 12264)
@@ -28,20 +28,10 @@
$this->initVar('user_group', XOBJ_DTYPE_INT);
$this->initVar('profile_group', XOBJ_DTYPE_INT);
}
-
- function ProfileVisibility()
- {
- $this->__construct();
- }
}
class ProfileVisibilityHandler extends XoopsPersistableObjectHandler
{
- function ProfileVisibilityHandler(&$db)
- {
- $this->__construct($db);
- }
-
function __construct(&$db)
{
parent::__construct($db, 'profile_visibility', 'profilevisibility', 'field_id');
|