Browse files

Merge branch 'master' of git://github.com/pixelcog/lithium into pixelcog

  • Loading branch information...
2 parents 471bdd6 + 6387beb commit 51d1770a49a3183c95441c726c27c5bf2031ea2a @nateabele nateabele committed Sep 13, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 template/view/Renderer.php
View
6 template/view/Renderer.php
@@ -486,8 +486,10 @@ public function set(array $data = array()) {
* @return string Returns a the rendered template content as a string.
*/
protected function _render($type, $template, array $data = array(), array $options = array()) {
- $library = $this->_request->library;
- $options += compact('library');
+ if ($this->_request) {
+ $library = $this->_request->library;
+ $options += compact('library');
+ }
return $this->_view->render($type, $data + $this->_data, compact('template') + $options);
}
}

0 comments on commit 51d1770

Please sign in to comment.