Changeset 3064:a484a50c8c14

Timestamp:

07/30/15 20:31:21 (9 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

dcTemplate::getSortByStr must allow new keys from foreign tables through templateCustomSortByAlias behavior.
Remove test for existing DC_RC_PATH constant.

Files:

• inc/core/class.dc.core.php (modified) (2 diffs)
• inc/public/class.dc.template.php (modified) (3 diffs)
• tests/unit/bootstrap.php (modified) (1 diff)
• tests/unit/inc/public/class.dc.template.php (added)

inc/core/class.dc.core.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2015 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
 
 /**

inc/public/class.dc.template.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2015 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
 
 class dcTemplate extends template
@@ -345 +344 @@
                          $alias[$k] = array();
                     }
-                    if (!is_array($v)) {
+                    if (!isset($default_alias[$k]) || !is_array($default_alias[$k])) {
                          $default_alias[$k] = array();
                     }

tests/unit/bootstrap.php

@@ -23 +23 @@
 $__autoload['pgsqlConnection'] = CLEARBRICKS_PATH.'/dblayer/class.pgsql.php';
 $__autoload['record'] = CLEARBRICKS_PATH.'/dblayer/dblayer.php';
+$__autoload['template'] = CLEARBRICKS_PATH.'/template/class.template.php';
+$__autoload['path'] = CLEARBRICKS_PATH.'/common/lib.files.php';
 
 $__autoload['dcCore'] = __DIR__.'/../../inc/core/class.dc.core.php';