Issue #259 fix missing static keyword for PHP 5.6+
This commit is contained in:
parent
182fedd52c
commit
6ca3cbf895
|
@ -1,3 +1,6 @@
|
|||
Version 1.2.2
|
||||
* Use PHP 5.3+ "static" function keyword
|
||||
|
||||
Version 1.2
|
||||
|
||||
* Fixed missing "realname" attribute in authentication
|
||||
|
|
|
@ -13,7 +13,7 @@ function escape($message) {
|
|||
|
||||
class serendipity_common_openid {
|
||||
|
||||
function redir_openidserver($openid_url, $store_path, $wfFlag=1) {
|
||||
static function redir_openidserver($openid_url, $store_path, $wfFlag=1) {
|
||||
global $serendipity;
|
||||
|
||||
$path_extra = dirname(__FILE__).DIRECTORY_SEPARATOR.'PHP-openid/';
|
||||
|
@ -71,7 +71,7 @@ class serendipity_common_openid {
|
|||
return false;
|
||||
}
|
||||
|
||||
function authenticate_openid($getData, $store_path, $returnData = false) {
|
||||
static function authenticate_openid($getData, $store_path, $returnData = false) {
|
||||
global $serendipity;
|
||||
|
||||
$trust_root = $serendipity['baseURL'] . 'serendipity_admin.php';
|
||||
|
@ -163,7 +163,7 @@ class serendipity_common_openid {
|
|||
return false;
|
||||
}
|
||||
|
||||
function getOpenID($userID, $checkExist=false) {
|
||||
static function getOpenID($userID, $checkExist=false) {
|
||||
global $serendipity;
|
||||
$q = "SELECT openid_url, authorid FROM {$serendipity['dbPrefix']}openid_authors WHERE authorid = " . (int)$userID;
|
||||
$author = serendipity_db_query($q, true);
|
||||
|
@ -177,7 +177,7 @@ class serendipity_common_openid {
|
|||
return '';
|
||||
}
|
||||
|
||||
function updateOpenID($openid_url, $authorID) {
|
||||
static function updateOpenID($openid_url, $authorID) {
|
||||
global $serendipity;
|
||||
|
||||
if (!is_array(serendipity_db_query("SELECT username FROM {$serendipity['dbPrefix']}openid_authors LIMIT 1", true, 'both', false, false, false, true))) {
|
||||
|
@ -203,7 +203,7 @@ class serendipity_common_openid {
|
|||
return ($retVal===true)?true:false;
|
||||
}
|
||||
|
||||
function load_account_selectbox() {
|
||||
static function load_account_selectbox() {
|
||||
global $serendipity;
|
||||
|
||||
$query = "SELECT DISTINCT a.realname, a.username, oa.openid_url
|
||||
|
@ -231,7 +231,7 @@ class serendipity_common_openid {
|
|||
return $result;
|
||||
}
|
||||
|
||||
function loginform($url, $hidden = array(), $useAutorSelector = true) {
|
||||
static function loginform($url, $hidden = array(), $useAutorSelector = true) {
|
||||
global $serendipity;
|
||||
|
||||
$imgopenid = $serendipity['baseURL'] . 'index.php?/plugin/openid.png';
|
||||
|
|
|
@ -13,7 +13,7 @@ class serendipity_event_openid extends serendipity_event
|
|||
$propbag->add('description', PLUGIN_OPENID_DESC);
|
||||
$propbag->add('stackable', false);
|
||||
$propbag->add('author', 'Grischa Brockhaus, Rob Richards');
|
||||
$propbag->add('version', '1.2.1');
|
||||
$propbag->add('version', '1.2.2');
|
||||
$propbag->add('requirements', array(
|
||||
'serendipity' => '1.2',
|
||||
'smarty' => '2.6.7',
|
||||
|
|
Loading…
Reference in a new issue