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
86790e6
..
323dbe2
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-64,10
+64,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
*/
function cfg()
{
*/
function cfg()
{
- static $loaded = false;
+
/*
static $loaded = false;
if ($loaded) {
return self::$cfg;
}
if ($loaded) {
return self::$cfg;
}
+ */
$loaded =true;
$ff= HTML_FlexyFramework::get();
$loaded =true;
$ff= HTML_FlexyFramework::get();
@@
-75,11
+76,12
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$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;
}
}
-
+ echo '<PRE>';print_R($opts);//exit;
// var_dump($opts);exit;
// var_dump($opts);exit;
@@
-92,8
+94,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
self::$cfg[$k] = $i->availableCodes($k, false);
continue;
}
self::$cfg[$k] = $i->availableCodes($k, false);
continue;
}
+ echo "$k / "; print_R($v);
self::$cfg[$k] = is_array($v) ? $v : explode(',', $v);
}
self::$cfg[$k] = is_array($v) ? $v : explode(',', $v);
}
+ print_R(self::$cfg);exit;
+
return self::$cfg;
return self::$cfg;
@@
-196,9
+201,11
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
$ret = array_merge($ret, array_keys($cfg['add_c']));
}
$ret = array_merge($ret, array_keys($cfg['add_c']));
}
+
$ret[] = '**';
$ret[] = '**';
+ echo '<PRE>';print_R($cfg); print_r($ret); exit;
break;
case 'l':
break;
case 'l':