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/controllers/Messages.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/controllers/Messages.class.php')
| -rw-r--r-- | src/controllers/Messages.class.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controllers/Messages.class.php b/src/controllers/Messages.class.php index d28d968..717e18e 100644 --- a/src/controllers/Messages.class.php +++ b/src/controllers/Messages.class.php @@ -1,5 +1,6 @@ <?php require_once('Login.class.php'); +require_once('Auth.class.php'); Router::register('messages', 'Messages', 'index'); Router::register('messages/index', 'Messages', 'index'); @@ -41,7 +42,7 @@ class Messages extends Controller { public function message($routed, $remainder) { $uid = Login::isLoggedIn(); - if ($uid===false || !Auth::getObj($uid)->isUser()) { + if ($uid===false || !Auth::getInstance($uid)->isUser()) { $this->http401($routed, $remainder); return; } |