Changeset 2991:bcd75776d061 for inc/core/class.dc.settings.php

Timestamp:

04/03/15 08:33:36 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Use dcCore pass as argument to constructor instead of global one.
$core property must be at least protected to not be considered as a settings.

File:

• inc/core/class.dc.settings.php (modified) (5 diffs)

inc/core/class.dc.settings.php

@@ -22 +22 @@
 class dcSettings
 {
+     protected $core;         ///< <b>connection</b> Database connection object
      protected $con;          ///< <b>connection</b> Database connection object
      protected $table;        ///< <b>string</b> Settings table name
@@ -39 +40 @@
      public function __construct($core,$blog_id)
      {
-          $this->con =& $core->con;
+        $this->core = &$core;
+          $this->con = &$core->con;
           $this->table = $core->prefix.'setting';
-          $this->blog_id =& $blog_id;
+          $this->blog_id = &$blog_id;
           $this->loadSettings();
      }
@@ -74 +76 @@
                     $rs->movePrev();
                }
-               $this->namespaces[$ns] = new dcNamespace($GLOBALS['core'], $this->blog_id, $ns,$rs);
+               $this->namespaces[$ns] = new dcNamespace($this->core, $this->blog_id, $ns,$rs);
           } while(!$rs->isStart());
      }
@@ -88 +90 @@
      {
           if (!array_key_exists($ns, $this->namespaces)) {
-               $this->namespaces[$ns] = new dcNamespace($GLOBALS['core'], $this->blog_id, $ns);
+               $this->namespaces[$ns] = new dcNamespace($this->core, $this->blog_id, $ns);
           }
           return $this->namespaces[$ns];
@@ -280 +282 @@
           if (!isset($this->namespaces[$this->ns])) {
                // Create namespace if needed
-               $this->namespaces[$this->ns] = new dcNamespace($GLOBALS['core'], $this->blog_id, $this->ns);
+               $this->namespaces[$this->ns] = new dcNamespace($this->core, $this->blog_id, $this->ns);
           }
           $this->namespaces[$this->ns]->put($id, $value, $type, $label, $value_change, $global);