Changeset 523 for trunk/lib/Lock.inc.php

Timestamp:

May 24, 2015 3:01:42 PM (9 years ago)

Author:

anonymous

Message:

First set of changes towards 2.2.0. Improved functinoality with integration in wordpress; bugs fixed.

File:

• trunk/lib/Lock.inc.php (modified) (4 diffs)

trunk/lib/Lock.inc.php

@@ -31 +31 @@
 class Lock
 {
-
     // A place to keep an object instance for the singleton pattern.
     protected static $instance = null;
@@ -51 +50 @@
 
     // Auth_SQL object from which to access a current user_id.
-    protected $_auth;
+    protected $_auth = null;
 
     /**
@@ -60 +59 @@
      * @static
      */
-    public static function &getInstance($auth_object)
+    public static function &getInstance($auth_object=null)
     {
         if (self::$instance === null) {
@@ -74 +73 @@
      * @param mixed  $auth_object  An Auth_SQL or Auth_FILE object.
      */
-    public function __construct($auth_object)
-    {
-        $app =& App::getInstance();
-
-        if (!method_exists($auth_object, 'get') || !method_exists($auth_object, 'getUsername')) {
-            trigger_error('Constructor not provided a valid Auth_* object.', E_USER_ERROR);
-        }
-
-        $this->_auth = $auth_object;
+    public function __construct($auth_object=null)
+    {
+        $app =& App::getInstance();
+
+        if (!is_null($auth_object) || is_null($this->_auth)) {
+            if (!method_exists($auth_object, 'get') || !method_exists($auth_object, 'getUsername')) {
+                trigger_error('Constructor not provided a valid Auth_* object.', E_USER_ERROR);
+            }
+
+            $this->_auth = $auth_object;
+        }
 
         // Get create tables config from global context.