Changeset 2567:6c11245cbf04 for inc/core/class.dc.namespace.php

Timestamp:

11/17/13 20:30:21 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2564:c8bf313d697e (diff), 2566:9bf417837888 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from 2.6

Files:

• inc/core/class.dc.namespace.php (modified) (1 diff)
• inc/core/class.dc.namespace.php (modified) (1 diff)

inc/core/class.dc.namespace.php

@@ -399 +399 @@
 
 }
-?>

inc/core/class.dc.namespace.php

@@ -125 +125 @@
 
      /**
+     Returns global setting value if exists.
+
+     @param    n         <b>string</b>       setting name
+     @return   <b>mixed</b>
+     */
+     public function getGlobal($n)
+     {
+          if (isset($this->global_settings[$n]['value'])) {
+               return $this->global_settings[$n]['value'];
+          }
+
+          return null;
+     }
+
+     /**
+     Returns local setting value if exists.
+
+     @param    n         <b>string</b>       setting name
+     @return   <b>mixed</b>
+     */
+     public function getLocal($n)
+     {
+          if (isset($this->local_settings[$n]['value'])) {
+               return $this->local_settings[$n]['value'];
+          }
+
+          return null;
+     }
+
+     /**
      Magic __get method.
      @copydoc ::get