replace all PHP4 style constructors with __construct; replace calls to base class constructors with parent::__construct()

4 files changed, 7 insertions, 7 deletions

diff --git a/LibertyBase.php b/LibertyBase.php
index 7d4d45b..bdc6c81 100644
--- a/LibertyBase.php
+++ b/LibertyBase.php
@@ -39,7 +39,7 @@ class LibertyBase extends BitBase {
 	 * Database will be linked via a previously activated BitDb object
 	 * which will provide the mDb pointer to that database
 	 */
-	function LibertyBase () {
+	function __construct() {
 		parent::__construct();
 	}
 
diff --git a/LibertyContent.php b/LibertyContent.php
index dc4d4d1..87f2537 100644
--- a/LibertyContent.php
+++ b/LibertyContent.php
@@ -99,8 +99,8 @@ class LibertyContent extends LibertyBase {
 	/**
 	 * Construct an empty LibertyBase object with a blank permissions array
 	 */
-	function LibertyContent () {
-		LibertyBase::LibertyBase();
+	function __construct() {
+		parent::__construct();
 		$this->mPrefs = NULL; // init to NULL so getPreference can determine if a load is necessary
 
 		// NOTE: we are not assigning anything to mViewContentPerm. if this is empty, we will return TRUE in hasViewPermission()
diff --git a/LibertyStructure.php b/LibertyStructure.php
index b9c8889..053729f 100644
--- a/LibertyStructure.php
+++ b/LibertyStructure.php
@@ -19,9 +19,9 @@ require_once( LIBERTY_PKG_PATH.'LibertyBase.php' );
 class LibertyStructure extends LibertyBase {
 	var $mStructureId;
 
-	function LibertyStructure ( $pStructureId=NULL, $pContentId=NULL ) {
+	function __construct( $pStructureId=NULL, $pContentId=NULL ) {
 		// we need to init our database connection early
-		LibertyBase::LibertyBase();
+		parent::__construct();
 		$this->mStructureId = $pStructureId;
 		$this->mContentId = $pContentId;
 	}
diff --git a/LibertySystem.php b/LibertySystem.php
index 88d739e..f42d143 100644
--- a/LibertySystem.php
+++ b/LibertySystem.php
@@ -94,8 +94,8 @@ class LibertySystem extends LibertyBase {
 	/**
 	 * Initiate Class
 	 **/
-	function LibertySystem( $pExtras = TRUE ) {
-		LibertyBase::LibertyBase();
+	function __construct( $pExtras = TRUE ) {
+		parent::__construct();
 
 		// if mPluginPath hasn't been set, we set it for liberty plugins
 		if( empty( $this->mPluginPath )) {