deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Enabled Search, Improved Navbar, Fixed Application Authorisation and some other minor fixes

Browse Source
This commit is contained in:
Deon George
2013-05-08 19:00:47 +10:00
parent 364cb58b7b
commit ce17247db6
27 changed files with 877 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/email/classes/Email/Template.php
View File

@@ -114,7 +114,7 @@ class Email_Template {
foreach ($this->components as $component) {
if ($this->etto->loaded()) {
$s = $this->etto->resolve($this->email_data['variables'],$component);
$s = $this->etto->rresolve($this->email_data['variables'],$component);
switch ($component) {
case 'message_html':

2
modules/email/classes/Model/Email/Log.php
View File

@@ -32,7 +32,7 @@ class Model_Email_Log extends ORM_OSB {
if (! $this->data OR ! ($this->email_template_translate->variables($column)))
return $this->email_template_translate->display($column);
else
return $this->email_template_translate->resolve($this->data,$column);
return $this->email_template_translate->rresolve($this->data,$column);
}
}
?>

2
modules/email/classes/Model/Email/Template/Translate.php
View File

@@ -28,7 +28,7 @@ class Model_Email_Template_Translate extends ORM_OSB {
return $results;
}
public function resolve($data,$column) {
public function rresolve($data,$column) {
$output = $this->display($column);
foreach ($this->variables($column) as $k => $v)