Merge branch 'master' into multiuser-viewmultiuser-view

Conflicts:
	src/controllers/Users.class.php

1 files changed, 1 insertions, 6 deletions

diff --git a/src/lib/Controller.class.php b/src/lib/Controller.class.php
index f9ed59d..05736ee 100644
--- a/src/lib/Controller.class.php
+++ b/src/lib/Controller.class.php
@@ -1,18 +1,13 @@
 <?php
 
-require_once('View.class.php');
-
 class Controller {
 	/**
 	 * Show a $view, in the most appropriate format (according to file
 	 * extension and HTTP Accept header).  Pass the array $vars to the view.
 	 */
 	protected function showView($view, $vars=null) {
-		global $mm;
-		
 		if ($vars===null) { $vars = array(); }
-		$vars['template'] = $mm->template();
-
+		
 		$obj = new View($view);		
 		$obj->show($vars);
 	}