From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Fri, 17 Sep 2021 14:09:20 +0000 (+0200)
Subject: Merge branch '6.1'
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=63af32f67638c771b2727698fa71407c61745d55;hp=84ab7414853549a0e3057ffa9b9c50fd081e7671

Merge branch '6.1'
---

diff --git a/src/CHANGES b/src/CHANGES
index 4f36d6cd79..2422b28ced 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -19,6 +19,7 @@ FusionForge 6.1.1:
 * Bin: fix forge help pages [#929] (Ralf Habacker)
 * Install System: add support for OpenSuSE Leap 15.x [#930] (Ralf Habacker)
 * Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
+* Plugin Authhttpd: fix wrong hook call [#947] (Ralf Habacker)
 * Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] (TrivialDev)
 * Plugin Scmhook: fix scmhook commitTracker [#911] (Florian Bruneau)
 * Plugin Scmsvn: fix <reponame>_scmsvn_paths.txt support [#906] (TrivialDev)
diff --git a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
index 0db4f3499a..65841e56ab 100644
--- a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
+++ b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
@@ -40,7 +40,7 @@ FusionForge, for instance where Kerberos is used.");
 		$this->_addHook("check_auth_session");
 		$this->_addHook("fetch_authenticated_user");
 		$this->_addHook("close_auth_session");
-		$this->_addHook('session_valid_login');
+		$this->_addHook('session_login_valid');
 
 		$this->saved_login = '';
 		$this->saved_user = NULL;