stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-04 03:59:09 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix set_global() to be more elegant and preserve local trumping

Browse Source
This commit is contained in:
Bharat Mediratta
2009-11-25 14:50:29 -08:00
parent 8b7ef66065
commit 7eacc465d5
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gallery/libraries/MY_View.php
View File

@@ -25,21 +25,6 @@ class View extends View_Core {
*/
public function set_global($key, $value) {
View::$global_data[$key] = $value;
$this->$key = $value;
}
public function __isset($key) {
if (array_key_exists($key, View::$global_data)) {
return true;
}
return parent::__isset($key);
}
public function &__get($key) {
if (array_key_exists($key, View::$global_data)) {
return View::$global_data[$key];
}
return parent::__get($key);
}
/**
@@ -58,9 +43,10 @@ class View extends View_Core {
*
* @see View_Core::render
*/
public function render($print=false, $renderer=false) {
public function render($print=false, $renderer=false, $modifier=false) {
try {
return parent::render($print, $renderer);
$this->kohana_local_data = array_merge(View::$global_data, $this->kohana_local_data);
return parent::render($print, $renderer, $modifier);
} catch (Exception $e) {
Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
return "";