Browse files

Changed a few properties to protected for consistency

  • Loading branch information...
1 parent 1fc3cd5 commit 2170bdd2e2b3b191d82337021acea6ffc107089a @lukemorton committed Jan 7, 2011
Showing with 8 additions and 8 deletions.
  1. +4 −4 README.markdown
  2. +4 −4 classes/prophet/controller.php
View
8 README.markdown
@@ -55,7 +55,7 @@ controller.php file like so:
class Controller extends Prophet_Controller {
- public $view_class = 'Kostache';
+ protected $_view_class = 'Kostache';
}
@@ -76,9 +76,9 @@ inclined. Take an example:
/**
* @var
- * @see Prophet_Controller::$viewless
+ * @see Prophet_Controller::$_viewless
*/
- public $viewless = array('create');
+ protected $_viewless = array('create');
/**
* For this action the view "blog/index" will have been already loaded.
@@ -139,7 +139,7 @@ you need to.
* @var mixed
* @see Prophet_Controller::$_view
*/
- public $view = FALSE;
+ protected $_view = FALSE;
}
View
8 classes/prophet/controller.php
@@ -11,12 +11,12 @@ class Prophet_Controller extends Kohana_Controller {
/**
* @var string The view class
*/
- public $view_class = 'View';
+ protected $_view_class = 'View';
/**
* @var array Define viewless actions here
*/
- public $viewless = array();
+ protected $_viewless = array();
/**
* @var mixed Holds the current view instance
@@ -34,7 +34,7 @@ public function __get($name)
{
if ($name === 'view')
{
- if ($this->_view === NULL && ! in_array($this->request->action(), $this->viewless))
+ if ($this->_view === NULL && ! in_array($this->request->action(), $this->_viewless))
{
$view_parts = array();
@@ -52,7 +52,7 @@ public function __get($name)
$view_location = implode('/', $view_parts);
// Load the view using chosen class
- $this->_view = call_user_func($this->view_class.'::factory', $view_location);
+ $this->_view = call_user_func($this->_view_class.'::factory', $view_location);
}
return $this->_view;

0 comments on commit 2170bdd

Please sign in to comment.