eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Manual merge of !87 Update LDAP2 extlib to 2.2.0 (stable) released on 2015-10-30

Browse Source 
Thanks postblue
This commit is contained in:
Mikael Nordfeldth
2016-01-28 13:34:45 +01:00
parent d73c264e25
commit bb0cb9b3f6
10 changed files with 101 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
View File

@@ -11,7 +11,7 @@
* @author Benedikt Hallinger <beni@php.net>
* @copyright 2009 Jan Wagner, Benedikt Hallinger
* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
* @version SVN: $Id: Schema.php 296515 2010-03-22 14:46:41Z beni $
* @version SVN: $Id$
* @link http://pear.php.net/package/Net_LDAP2/
* @todo see the comment at the end of the file
*/
@@ -109,9 +109,9 @@ class Net_LDAP2_Schema extends PEAR
*
* @access protected
*/
protected function __construct()
public function __construct()
{
$this->PEAR('Net_LDAP2_Error'); // default error class
parent::__construct('Net_LDAP2_Error'); // default error class
}
/**
@@ -123,7 +123,7 @@ class Net_LDAP2_Schema extends PEAR
* @access public
* @return Net_LDAP2_Schema|NET_LDAP2_Error
*/
public function fetch($ldap, $dn = null)
public static function fetch($ldap, $dn = null)
{
if (!$ldap instanceof Net_LDAP2) {
return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");