Merge branch 'master' of git://github.com/philsturgeon/codeigniter-template

Author: Phil Sturgeon

libraries/Template.php

@@ -278,8 +278,9 @@ public function build($view, $data = array(), $return = FALSE)
 	public function title()
 	{
 		// If we have some segments passed
-		if ($title_segments =& func_get_args())
+		if (func_num_args() >= 1)
 		{
+			$title_segments = func_get_args();
 			$this->_title = implode($this->_title_separator, $title_segments);
 		}
 
@@ -630,6 +631,20 @@ public function layout_exists($layout)
 		return file_exists(self::_find_view_folder().'layouts/' . $layout . self::_ext($layout));
 	}
 
+	/**
+	 * load_view
+	 * Load views from theme paths if they exist.
+	 *
+	 * @access	public
+	 * @param	string	$view
+	 * @param	mixed	$data
+	 * @return	array
+	 */
+	public function load_view($view, $data = array())
+	{
+		return $this->_find_view($view, (array)$data);
+	}
+
 	// find layout files, they could be mobile or web
 	private function _find_view_folder()
 	{

user_guide/library.html

@@ -182,6 +182,21 @@ <h2>inject_partial()</h2>
 	->build('welcome_message');</pre>
 	<br />
 
+	<a name="load_view"></a>
+	<h2>load_view()</h2>
+	<p>Load views from theme paths if they exist.</p>
+
+	<p><strong>Parameters</strong></p>
+	<ol>
+		<li><var>$view</var>- string REQUIRED - Name of the view to be loaded.</li>
+		<li><var>$data</var> - array/object OPTIONAL - assign some extra data for this view.</li>
+	</ol>
+
+	<p><strong>Return</strong></p>
+	<ul>
+		<li>string. The contents of the rendered view.</li>
+	</ul>
+
 	<a name="build"></a>
 	<h2>build()</h2>
 	<p>Build the entire HTML combining partials, layouts and views.</p>