Changeset 1315:220e119ae6c8 for inc/core

Timestamp:

08/09/13 08:01:31 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1158:9d7267aec27b (diff), 1314:99a1319b79fc (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 with default

Location:

inc/core

Files:

• class.dc.blog.php (modified) (4 diffs)
• class.dc.core.php (modified) (4 diffs)

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = http::getHostFromURL($this->url);
+               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -805 +805 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
           }
           
@@ -889 +889 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }
           

inc/core/class.dc.core.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -39 +39 @@
      public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
+     public $tpl;        ///< <b>Twig_Environment</b>  Twig_Environment object
      
      private $versions = null;
@@ -95 +96 @@
           $this->addFormater('xhtml', create_function('$s','return $s;'));
           $this->addFormater('wiki', array($this,'wikiTransform'));
+          $this->loadTemplateEnvironment();
      }
      
@@ -118 +120 @@
      }
      
+     /**
+     Create template environment (Twig_Environment instance)
+     
+     default-templates path must be added from admin|public/prepend.php with:
+     $core->tpl->getLoader()->addPath('PATH_TO/default-templates');
+     Selected theme path must be added with:
+     $core->tpl->getLoader()->prependPath('PATH_TO/MY_THEME');
+     */
+     public function loadTemplateEnvironment()
+     {
+          $cache_dir = path::real(DC_TPL_CACHE.'/twtpl',false);
+          if (!is_dir($cache_dir)) {
+               try {
+                    files::makeDir($cache_dir);
+               } catch (Exception $e) {
+                    $cache_dir = false;
+               }
+          }
+          
+          $this->tpl = new Twig_Environment(
+               new Twig_Loader_Filesystem(dirname(__FILE__).'/../swf'),
+               array(
+                    'auto_reload' => true,
+                    'autoescape' => false,
+                    'base_template_class' => 'Twig_Template',
+                    'cache' => $cache_dir, 
+                    'charset' => 'UTF-8',
+                    'debug' => DC_DEBUG,
+                    'optimizations' => -1,
+                    'strict_variables' => 0 //DC_DEBUG // Please fix undefined variables!
+               )
+          );
+          $this->tpl->addExtension(new dcFormExtension($this));
+          $this->tpl->addExtension(new dcTabExtension($this));
+     }
      
      /// @name Blog init methods