/[drupal]/contributions/theme-engines/smarty/smarty.engine
ViewVC logotype

Diff of /contributions/theme-engines/smarty/smarty.engine

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.11, Sat Dec 31 09:38:51 2005 UTC revision 1.11.2.1, Tue Jan 10 09:10:59 2006 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: smarty.engine,v 1.10 2005/12/31 09:24:02 tclineks Exp $  // $Id: smarty.engine,v 1.11 2005/12/31 09:38:51 tclineks Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 69  function _smarty_callback($hook, $variab Line 69  function _smarty_callback($hook, $variab
69      $variables = array_merge($variables, _smarty_variables($hook, $variables));      $variables = array_merge($variables, _smarty_variables($hook, $variables));
70    }    }
71    
72    if ($variables['template_file']) {    if (isset($variables['template_file'])) {
73      $file = $variables['template_file'];      $file = $variables['template_file'];
74    }    }
75    
# Line 254  function smarty_node($node, $teaser = 0, Line 254  function smarty_node($node, $teaser = 0,
254    );    );
255    
256    // Flatten the node object's member fields.    // Flatten the node object's member fields.
257      $variables = array_merge(object2array($node), $variables);    $variables = array_merge((array) $node, $variables);
258    
259    // Display info only on certain node types.    // Display info only on certain node types.
260    if (theme_get_setting('toggle_node_info_' . $node->type)) {    if (theme_get_setting('toggle_node_info_' . $node->type)) {
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.11.2.1
  ViewVC Help
Powered by ViewVC 1.1.2