[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/sysadmin-kde-org-trellis] includes: Revert "Use the system wide Net/LDAP2 properly"
From:       Ben Cooksley <bcooksley () kde ! org>
Date:       2013-04-06 23:37:45
Message-ID: 20130406233745.2ECBCA6059 () git ! kde ! org
[Download RAW message or body]

Git commit 48ef13dd6c3feb5f662cb5c34ac2874c558e6856 by Ben Cooksley.
Committed on 07/04/2013 at 01:36.
Pushed by bcooksley into branch 'master'.

Revert "Use the system wide Net/LDAP2 properly"

This reverts commit e6a329d561591d5a5b112cdcc3dc122a27fe4e8a.

M  +2    -1    includes/trellis.php

http://commits.kde.org/websites/sysadmin-kde-org-trellis/48ef13dd6c3feb5f662cb5c34ac2874c558e6856

diff --git a/includes/trellis.php b/includes/trellis.php
index 024297b..05b36f8 100755
--- a/includes/trellis.php
+++ b/includes/trellis.php
@@ -1484,7 +1484,8 @@ class trellis {
     public function execute_ldap_authentication()
     {
         # Prepare PEAR...
-        include_once('Net/LDAP2.php');
+        set_include_path( get_include_path() . PATH_SEPARATOR . 'includes/');
+        include_once( TD_INC . 'Net/LDAP2.php');
 
         # Connect to LDAP
         $ldap = Net_LDAP2::connect( $this->config['ldapConfig'] );

[prev in list] [next in list] [prev in thread] [next in thread]