Changeset 2139

Show
Ignore:
Timestamp:
02/22/2008 12:40:05 PM (9 months ago)
Author:
Shadowhand
Message:

Removed all system calls to Kohana::instance(), in favor of Kohana::$instance

Location:
trunk/system/libraries
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/system/libraries/ORM.php

    r2090 r2139  
    715715                { 
    716716                        // Load database, if not already loaded 
    717                         isset(Kohana::instance()->db) or Kohana::instance()->db = Database::instance(); 
     717                        isset(Kohana::$instance->db) or Kohana::$instance->db = Database::instance(); 
    718718 
    719719                        // Insert db into this object 
    720                         self::$db = Kohana::instance()->db; 
     720                        self::$db = Kohana::$instance->db; 
    721721 
    722722                        // Define ALL 

  • trunk/system/libraries/Pagination.php

    r2097 r2139  
    9696                $this->items_per_page     = (int) max(1, $this->items_per_page); 
    9797                $this->total_pages        = (int) ceil($this->total_items / $this->items_per_page); 
    98                 $this->current_page       = (int) min(max(1, Kohana::instance()->uri->segment($this->uri_segment)), max(1, $this->total_pages)); 
     98                $this->current_page       = (int) min(max(1, Kohana::$instance->uri->segment($this->uri_segment)), max(1, $this->total_pages)); 
    9999                $this->current_first_item = (int) min((($this->current_page - 1) * $this->items_per_page) + 1, $this->total_items); 
    100100                $this->current_last_item  = (int) min($this->current_first_item + $this->items_per_page - 1, $this->total_items); 

  • trunk/system/libraries/View.php

    r1911 r2139  
    186186 
    187187                        // Load the view in the controller for access to $this 
    188                         $output = Kohana::instance()->_kohana_load_view($this->kohana_filename, $data); 
     188                        $output = Kohana::$instance->_kohana_load_view($this->kohana_filename, $data); 
    189189 
    190190                        if ($renderer == TRUE AND is_callable($renderer, TRUE))