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

PHP 5.3 compatibility hack for DB_DataObject

Browse Source 
statusnet.links.ini file could not be read anymore due to the entry for nonce containing a comma in its key value.
PHP's parse_ini_file() function no longer allows commas in keys, and rejects the *ENTIRE FILE* if it's present, breaking various automatic joins.
This commit is contained in:
Brion Vibber 2010-02-12 11:15:12 -08:00
parent 22025e3b7b
commit fd3c9334bf
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/Nonce.php
View File

@ -22,4 +22,19 @@ class Nonce extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
/**
* Compatibility hack for PHP 5.3
*
* The statusnet.links.ini entry cannot be read because "," is no longer
* allowed in key names when read by parse_ini_file().
*
* @return array
* @access public
*/
function links()
{
return array('consumer_key,token' => 'token:consumer_key,token');
}
} }

7
classes/statusnet.links.ini
View File

@ -19,8 +19,11 @@ profile_id = profile:id
[token] [token]
consumer_key = consumer:consumer_key consumer_key = consumer:consumer_key
[nonce] ; Compatibility hack for PHP 5.3
consumer_key,token = token:consumer_key,token ; This entry has been moved to the class definition, as commas are no longer
; considered valid in keys, causing parse_ini_file() to reject the whole file.
;[nonce]
;consumer_key,token = token:consumer_key,token
[confirm_address] [confirm_address]
user_id = user:id user_id = user:id