Merge commit 'refs/merge-requests/2' of git://gitorious.org/owncloud/owncloud

2 files changed, 4 insertions, 4 deletions

diff --git a/inc/lib_base.php b/inc/lib_base.php
index 1ae2bdab877..9419226aca6 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -57,7 +57,7 @@ class OC_USER {
    * check if the login button is pressed and logg the user in
    *
    */
-  public static function loginlisener(){
+  public static function loginlistener(){
     global $CONFIG_ADMINLOGIN;
     global $CONFIG_ADMINPASSWORD;
     if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){
@@ -74,7 +74,7 @@ class OC_USER {
    * check if the logout button is pressed and logout the user
    *
    */
-  public static function logoutlisener(){
+  public static function logoutlistener(){
     if(isset($_GET['logoutbutton'])){
       OC_LOG::event($_SESSION['username'],2,'');
       if(isset($_SESSION['username'])) unset($_SESSION['username']);
diff --git a/index.php b/index.php
index 5f7eb8e12ba..ffe66e41953 100755
--- a/index.php
+++ b/index.php
@@ -32,8 +32,8 @@ if(isset($_GET['file'])) {
 
 }else{
 
-  OC_USER::loginlisener();
-  OC_USER::logoutlisener();
+  OC_USER::loginlistener();
+  OC_USER::logoutlistener();
 
   OC_UTIL::showheader();