projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/I18n.php
[Pman.Core]
/
DataObjects
/
I18n.php
diff --git
a/DataObjects/I18n.php
b/DataObjects/I18n.php
index
e2ed9cc
..
7d04c9d
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-70,16
+70,17
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
}
$loaded =true;
$ff= HTML_FlexyFramework::get();
}
$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)) {
$opts = array();
foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
if (isset($ff->$pk)) {
+ var_dump($pk);
$opts= $ff->$pk;
break;
}
}
$opts= $ff->$pk;
break;
}
}
-
- // since our opts array changed alot..
- $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N) : $ff->Pman_Core_I18N;
+ //print_R($opts);
// var_dump($opts);exit;
// var_dump($opts);exit;