Projekt

Obecné

Profil

« Předchozí | Další » 

Revize c478920d

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..

Zobrazit rozdíly:

system/libraries/Controller.php
* @author Kohana Team
* @copyright (c) 2007-2008 Kohana Team
* @license http://kohanaphp.com/license.html
*
*
* @property Loader $load
* @property URI $uri
* @property Input $input
......
// Set the instance to the first controller loaded
Kohana::$instance = $this;
// Loader should always be available
$this->load = new Loader;
// Loader should always be available
$this->uri = new URI;
......
}
else
{
// Loader should always be available
$this->load = Kohana::$instance->load;
// Loader should always be available
$this->uri = Kohana::$instance->uri;

Také k dispozici: Unified diff