diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-12 11:15:12 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-12 11:15:12 -0800 |
| commit | fd3c9334bfcfe627446feb86ac3054b24ed05449 (patch) | |
| tree | cca5ba571fcb325113a7bc9541f7d0e977a6b804 | |
| parent | 22025e3b7b5ddfd26162a59b697690f50775c79c (diff) | |
PHP 5.3 compatibility hack for DB_DataObject
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.
| -rw-r--r-- | classes/Nonce.php | 15 | ||||
| -rw-r--r-- | classes/statusnet.links.ini | 7 |
2 files changed, 20 insertions, 2 deletions
diff --git a/classes/Nonce.php b/classes/Nonce.php index 486a65a3c..2f8ab00b5 100644 --- a/classes/Nonce.php +++ b/classes/Nonce.php @@ -22,4 +22,19 @@ class Nonce extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###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'); + } + } diff --git a/classes/statusnet.links.ini b/classes/statusnet.links.ini index 7f233e676..b9dd5af0c 100644 --- a/classes/statusnet.links.ini +++ b/classes/statusnet.links.ini @@ -19,8 +19,11 @@ profile_id = profile:id [token] consumer_key = consumer:consumer_key -[nonce] -consumer_key,token = token:consumer_key,token +; Compatibility hack for PHP 5.3 +; 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] user_id = user:id |