diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-18 22:36:25 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-18 22:36:25 +0200 |
| commit | 690e98d45afc46b69df0559dce1ed9da85091e1d (patch) | |
| tree | 55bb45c2aadf78b304cbf3560651466dd9fb0efa /lib/appframework/controller/controller.php | |
| parent | b0762ad3bf5121ccd300ec6c22641c3bf323ba61 (diff) | |
| parent | 69c28400b47a3a16ead6fc0d5ee5e2212d0d8ab0 (diff) | |
| download | nextcloud-server-690e98d45afc46b69df0559dce1ed9da85091e1d.tar.gz nextcloud-server-690e98d45afc46b69df0559dce1ed9da85091e1d.zip | |
Merge branch 'appframework-master' into vcategories_public
Conflicts:
lib/server.php
Diffstat (limited to 'lib/appframework/controller/controller.php')
| -rw-r--r-- | lib/appframework/controller/controller.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/appframework/controller/controller.php b/lib/appframework/controller/controller.php index a7498ba0e1e..0ea0a38cc09 100644 --- a/lib/appframework/controller/controller.php +++ b/lib/appframework/controller/controller.php @@ -107,16 +107,6 @@ abstract class Controller { /** - * Shortcut for getting session variables - * @param string $key the key that will be taken from the $_SESSION array - * @return array the value in the $_SESSION element - */ - public function session($key) { - return $this->request->getSession($key); - } - - - /** * Shortcut for getting cookie variables * @param string $key the key that will be taken from the $_COOKIE array * @return array the value in the $_COOKIE element |