Changeset 341:796cb01c7120 for inc/public

Timestamp:

06/07/11 07:29:49 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

2.3

Children:

343:f9fcb964c910, 362:b070e9822ded

Message:

Context no more overrides tag attributes. Closes #1110

File:

• inc/public/class.dc.template.php (modified) (2 diffs)

inc/public/class.dc.template.php

@@ -563 +563 @@
           }
           
-          if (empty($attr['no_context']))
+          if (empty($attr['no_context']) && !isset($attr['category']))
           {
                $p .=
@@ -1324 +1324 @@
           if (empty($attr['no_context']))
           {
-               $p .=
-               'if ($_ctx->exists("users")) { '.
-                    "\$params['user_id'] = \$_ctx->users->user_id; ".
-               "}\n";
+               if (!isset($attr['author']))
+               {
+                    $p .=
+                    'if ($_ctx->exists("users")) { '.
+                         "\$params['user_id'] = \$_ctx->users->user_id; ".
+                    "}\n";
+               }
                
-               $p .=
-               'if ($_ctx->exists("categories")) { '.
-                    "\$params['cat_id'] = \$_ctx->categories->cat_id; ".
-               "}\n";
+               if (!isset($attr['category']) && (!isset($attr['no_category']) || !$attr['no_category']))
+               {
+                    $p .=
+                    'if ($_ctx->exists("categories")) { '.
+                         "\$params['cat_id'] = \$_ctx->categories->cat_id; ".
+                    "}\n";
+               }
                
                $p .=