Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved exception view to application views and removed system view folder.

This commit is contained in:
Taylor Otwell 2011-07-31 12:54:22 -05:00
parent 2c68317b0d
commit b504089db7
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
system/views/exception.php → application/views/error/exception.php
View File

1
public/index.php
View File

@ -44,7 +44,6 @@
'SESSION_PATH' => APP_PATH.'storage/sessions/', 'SESSION_PATH' => APP_PATH.'storage/sessions/',
'STORAGE_PATH' => APP_PATH.'storage/', 'STORAGE_PATH' => APP_PATH.'storage/',
'STYLE_PATH' => PUBLIC_PATH.'css/', 'STYLE_PATH' => PUBLIC_PATH.'css/',
'SYS_VIEW_PATH' => SYS_PATH.'views/',
'VIEW_PATH' => APP_PATH.'views/', 'VIEW_PATH' => APP_PATH.'views/',
); );

30
system/view.php
View File

@ -41,7 +41,13 @@ public function __construct($view, $data = array())
{ {
$this->view = $view; $this->view = $view;
$this->data = $data; $this->data = $data;
$this->path = $this->find();
if ( ! file_exists($path = VIEW_PATH.$view.EXT))
{
throw new \Exception("View [$view] does not exist.");
}
$this->path = $path;
} }
/** /**
@ -106,28 +112,6 @@ public function get()
return ob_get_clean(); return ob_get_clean();
} }
/**
* Get the full path to the view.
*
* Views are cascaded, so the application directory views will take
* precedence over system directory views of the same name.
*
* @return string
*/
protected function find()
{
if (file_exists($path = VIEW_PATH.$this->view.EXT))
{
return $path;
}
elseif (file_exists($path = SYS_VIEW_PATH.$this->view.EXT))
{
return $path;
}
throw new \Exception("View [".$this->view."] doesn't exist.");
}
/** /**
* Add a view instance to the view data. * Add a view instance to the view data.
* *