Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22055/functions
Modified Files:
Tag: SM-1_4-STABLE
addressbook.php
Log Message:
correct init sequence is personal abooks, global abooks, abook_init hook,
ldap abooks.
Index: addressbook.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/addressbook.php,v
retrieving revision 1.47.2.14
retrieving revision 1.47.2.15
diff -u -w -r1.47.2.14 -r1.47.2.15
--- addressbook.php 15 Jun 2005 21:11:57 -0000 1.47.2.14
+++ addressbook.php 15 Sep 2005 07:46:29 -0000 1.47.2.15
@@ -96,17 +96,6 @@
}
}
-
- /*
- * hook allows to include different address book backends.
- * plugins should extract $abook and $r from arguments
- * and use same add_backend commands as above functions.
- * @since 1.5.1 and 1.4.5
- */
- $hookReturn = do_hook('abook_init', $abook, $r);
- $abook = $hookReturn[1];
- $r = $hookReturn[2];
-
/* Load global addressbook from SQL if configured */
if (isset($addrbook_global_dsn) && !empty($addrbook_global_dsn)) {
/* Database configured */
@@ -126,6 +115,16 @@
}
}
+ /*
+ * hook allows to include different address book backends.
+ * plugins should extract $abook and $r from arguments
+ * and use same add_backend commands as above functions.
+ * @since 1.5.1 and 1.4.5
+ */
+ $hookReturn = do_hook('abook_init', $abook, $r);
+ $abook = $hookReturn[1];
+ $r = $hookReturn[2];
+
if (! $onlylocal) {
/* Load configured LDAP servers (if PHP has LDAP support) */
if (isset($ldap_server) && is_array($ldap_server) &&
function_exists('ldap_connect')) {
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
|
