Permalink
Browse files

Merge branch '3.0/release/3.0.10' into 3.0/master

  • Loading branch information...
2 parents d43b77d + eceed49 commit e7cc3fd2e4d6bed949c5d9d058ee54cf7a22559a @zombor zombor committed Mar 14, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 classes/kohana/pagination.php
@@ -239,7 +239,7 @@ public function render($view = NULL)
$view = $this->config['view'];
}
- if ( ! $view instanceof Kohana_View)
+ if ( ! $view instanceof View)
{
// Load the view file
$view = View::factory($view);
@@ -262,7 +262,7 @@ public function __toString()
/**
* Returns a Pagination property.
*
- * @param string URI of the request
+ * @param string property name
* @return mixed Pagination property; NULL if not found
*/
public function __get($key)

0 comments on commit e7cc3fd

Please sign in to comment.