Changeset 656

Show
Ignore:
Timestamp:
10/04/2007 11:55:00 PM (14 months ago)
Author:
Geert
Message:

Fixing regex in View (no pipes inside character class unless you want to match that character as well)

Location:
trunk/system
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/system/core/Benchmark.php

    r654 r656  
    6464         * 
    6565         * @access  public 
     66         * @param   integer 
    6667         * @return  array 
    6768         */ 
    68         public static function get_all() 
     69        public static function get_all($decimals = 4) 
    6970        { 
    7071                $benchmarks = array(); 
    71                 foreach (self::$marks as $name => $times) 
     72                foreach (self::$marks as $name) 
    7273                { 
    73                         $benchmarks[$name] = self::get($name); 
     74                        $benchmarks[$name] = self::get($name, $decimals); 
    7475                } 
    7576 

  • trunk/system/libraries/View.php

    r652 r656  
    4242        public function __construct($name, $data = NULL) 
    4343        { 
    44                 if (preg_match('/\.([g|t]if|jpe?g|png|swf|js|css)$/Di', $name, $type)) 
     44                if (preg_match('/\.([gt]if|jpe?g|png|js|css|swf)$/Di', $name, $type)) 
    4545                { 
    4646                        $type = $type[1]; 

  • trunk/system/libraries/drivers/Database_Mysql.php

    r655 r656  
    311311        public function list_tables() 
    312312        { 
    313                 $sql = "SHOW TABLES FROM `".$this->db_config['connection']['database']."`"; 
     313                $sql = 'SHOW TABLES FROM `'.$this->db_config['connection']['database'].'`'; 
    314314                $query = $this->query($sql); 
    315315                $query = $query->result();