projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
ee573f6
)
DataObjects/I18n.php
author
Alan Knowles
<alan@roojs.com>
Mon, 18 Aug 2014 07:20:19 +0000
(15:20 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 18 Aug 2014 07:20:19 +0000
(15:20 +0800)
DataObjects/I18n.php
patch
|
blob
|
history
diff --git
a/DataObjects/I18n.php
b/DataObjects/I18n.php
index
e2ed9cc
..
86790e6
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-70,6
+70,8
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
$loaded =true;
$ff= HTML_FlexyFramework::get();
+
+ // BC compatible.. if any of these are set, then we use them as the settings..
$opts = array();
foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
if (isset($ff->$pk)) {
@@
-78,8
+80,6
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
}
- // since our opts array changed alot..
- $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N) : $ff->Pman_Core_I18N;
// var_dump($opts);exit;