projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
709e1d0
)
I18n.php
author
Alan Knowles
<alan@akbkhome.com>
Thu, 16 Sep 2010 04:09:09 +0000
(12:09 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Thu, 16 Sep 2010 04:09:09 +0000
(12:09 +0800)
I18n.php
patch
|
blob
|
history
diff --git
a/I18n.php
b/I18n.php
index
9f345f4
..
c0ea330
100644
(file)
--- a/
I18n.php
+++ b/
I18n.php
@@
-93,11
+93,8
@@
class Pman_Core_i18N extends Pman
//}
$this->authUser = $au;
//}
$this->authUser = $au;
- $opts = PEAR::getStaticProperty('Pman_Core_I18N', 'options');
- if (empty($opts)) {
- $opts = PEAR::getStaticProperty('Pman_I18N', 'options');
- }
- $opts = empty($opts) ? array() : $opts;
+ $ff= HTML_FlexyFramework::get();
+ $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N) : $ff->Pman_Core_I18N;
// load the cofiguration
foreach($opts as $k=>$v) {
// load the cofiguration
foreach($opts as $k=>$v) {