Skip to content

No benefit to exceptional processing for theme in initialize method ... #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuroi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No benefit to exceptional processing for theme in initialize method ... #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions libraries/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ function initialize($config = array())
{
foreach ($config as $key => $val)
{
if ($key == 'theme' AND $val != '')
{
$this->set_theme($val);
continue;
}

$this->{'_'.$key} = $val;
}
Expand Down Expand Up @@ -252,7 +247,7 @@ public function build($view, $data = array(), $return = FALSE)
// Want this file wrapped with a layout file?
if ($this->_layout)
{
// Added to $this->_data['template'] by refference
// Added to $this->_data['template'] by reference
$template['body'] = $this->_body;

// Find the main body and 3rd param means parse if its a theme view (only if parser is enabled)
Expand Down Expand Up @@ -288,7 +283,7 @@ public function title()


/**
* Put extra javascipt, css, meta tags, etc before all other head data
* Put extra javascript, css, meta tags, etc before all other head data
*
* @access public
* @param string $line The line being added to head
Expand All @@ -302,7 +297,7 @@ public function prepend_metadata($line)


/**
* Put extra javascipt, css, meta tags, etc after other head data
* Put extra javascript, css, meta tags, etc after other head data
*
* @access public
* @param string $line The line being added to head
Expand Down Expand Up @@ -695,13 +690,13 @@ private function _find_view($view, array $data, $parse_view = TRUE)
}
}

// Not found it yet? Just load, its either in the module or root view
// Not found it yet? Just load, it's either in the module or root view
return self::_load_view($view, $this->_data + $data, $parse_view);
}

private function _load_view($view, array $data, $parse_view = TRUE, $override_view_path = NULL)
{
// Sevear hackery to load views from custom places AND maintain compatibility with Modular Extensions
// Severe hackery to load views from custom places AND maintain compatibility with Modular Extensions
if ($override_view_path !== NULL)
{
if ($this->_parser_enabled === TRUE AND $parse_view === TRUE)
Expand Down