Changeset 3704


Ignore:
Timestamp:
Jul 30, 2009, 6:00:04 AM (12 years ago)
Author:
rvelices
Message:

merge r3703 from trunk - fix smarty debugging info (not important)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/include/smarty/libs/Smarty.class.php

    r3583 r3704  
    2121 * For questions, help, comments, discussion, etc., please join the
    2222 * Smarty mailing list. Send a blank e-mail to
    23  * smarty-discussion-subscribe@googlegroups.com 
     23 * smarty-discussion-subscribe@googlegroups.com
    2424 *
    2525 * @link http://www.smarty.net/
     
    10591059            // var non-existant, return valid reference
    10601060            $_tmp = null;
    1061             return $_tmp;   
     1061            return $_tmp;
    10621062        }
    10631063    }
     
    11181118    {
    11191119        static $_cache_info = array();
    1120        
     1120
    11211121        $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
    11221122               ? $this->error_reporting : error_reporting() & ~E_NOTICE);
     
    13051305            return;
    13061306        } else {
     1307            if ($this->debugging) {
     1308                // capture time for debugging info
     1309                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
     1310                $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime(array(), $this) - $_debug_start_time);
     1311            }
    13071312            error_reporting($_smarty_old_error_level);
    13081313            if (isset($_smarty_results)) { return $_smarty_results; }
     
    19341939        return eval($code);
    19351940    }
    1936    
     1941
    19371942    /**
    19381943     * Extracts the filter name from the given callback
    1939      * 
     1944     *
    19401945     * @param callback $function
    19411946     * @return string
     
    19521957                }
    19531958        }
    1954  
     1959
    19551960    /**#@-*/
    19561961
Note: See TracChangeset for help on using the changeset viewer.