Changeset 2567:6c11245cbf04 for inc/core

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

Location:

inc/core

Files:

• class.dc.blog.php (modified) (1 diff)
• class.dc.blog.php (modified) (2 diffs)
• class.dc.namespace.php (modified) (1 diff)
• class.dc.namespace.php (modified) (1 diff)
• class.dc.themes.php (modified) (1 diff)

inc/core/class.dc.blog.php

@@ -2385 +2385 @@
      //@}
 }
-?>

inc/core/class.dc.blog.php

@@ -1894 +1894 @@
      - post_id: (integer) Get comments belonging to given post_id
      - cat_id: (integer or array) Get comments belonging to entries of given category ID
-     - comment_id: (integer) Get comment with given ID
+     - comment_id: (integer or array) Get comment with given ID (or IDs)
      - comment_site: (string) Get comments with given comment_site
      - comment_status: (integer) Get comments with given comment_status
@@ -1984 +1984 @@
 
           if (isset($params['comment_id']) && $params['comment_id'] !== '') {
-               $strReq .= 'AND comment_id = '.(integer) $params['comment_id'].' ';
+               if (is_array($params['comment_id'])) {
+                    array_walk($params['comment_id'],create_function('&$v,$k','if($v!==null){$v=(integer)$v;}'));
+               } else {
+                    $params['comment_id'] = array((integer) $params['comment_id']);
+               }
+               $strReq .= 'AND comment_id '.$this->con->in($params['comment_id']);
           }
 

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

inc/core/class.dc.themes.php

@@ -59 +59 @@
           # Themes specifics properties
           $properties = array_merge(
-               array('parent' => null),
+               array('parent' => null, 'tplset' => 'legacy'),
                $properties,
                array('permissions' => 'admin') // force themes perms