diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-27 19:51:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-27 19:51:48 -0400 |
| commit | 2d7a47a99be783c1933af0b24978dc2bbdfe9350 (patch) | |
| tree | 8eefffd8cf1f3db2ce6efcb8e50846c943e6df61 /src/lib/View.class.php | |
| parent | db4376c0c1d5d2ea72696e6d73b469cb2dc30b91 (diff) | |
| parent | 29a3ffb99435827d5a7ea6886ac22bd2ee18d593 (diff) | |
Merge branch 'master' into multiuser-viewmultiuser-view
Conflicts:
src/controllers/Users.class.php
Diffstat (limited to 'src/lib/View.class.php')
| -rw-r--r-- | src/lib/View.class.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/View.class.php b/src/lib/View.class.php index 33a9c4e..d7a21d3 100644 --- a/src/lib/View.class.php +++ b/src/lib/View.class.php @@ -123,7 +123,10 @@ class View { $mimes = Mime::ext2mime($this->ext); header('Content-type: '.$mimes[0]); - + + require_once(VIEWPATH.'/Template.class.php'); + $vars['template'] = new Template(); + global $VARS; $VARS = $vars; include($file); |