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
6e72f41
..
7cf04c1
100644
(file)
--- a/
DataObjects/I18n.php
+++ b/
DataObjects/I18n.php
@@
-74,7
+74,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
// BC compatible.. if any of these are set, then we use them as the settings..
$opts = array();
// 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) {
+ foreach(array('Pman_Core_I18
n', 'Pman_Core_I18
N', 'Pman_I18N','Pman_I18n') as $pk) {
if (isset($ff->$pk)) {
//var_dump($pk);
$opts = $ff->$pk;
if (isset($ff->$pk)) {
//var_dump($pk);
$opts = $ff->$pk;
@@
-84,7
+84,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
//echo '<PRE>';print_R($opts);//exit;
//echo '<PRE>';print_R($opts);//exit;
-
//
var_dump($opts);exit;
+
//
var_dump($opts);exit;
$i = DB_DataObject::Factory('I18n');
// load the cofiguration
$i = DB_DataObject::Factory('I18n');
// load the cofiguration
@@
-101,7
+101,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
foreach($opts as $k=>$v) {
if ($v == '*') { // everything..
foreach($opts as $k=>$v) {
if ($v == '*') { // everything..
-
self::$cfg[$k] =
$i->availableCodes($k, false);
+
self::$cfg[$k] = '*'; //
$i->availableCodes($k, false);
continue;
}
continue;
}
@@
-138,8
+138,9
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
if (!empty($q['_filtered']) && !empty($this->ltype)) {
$cfg = $this->cfg();
$filter = $cfg[$this->ltype];
if (!empty($q['_filtered']) && !empty($this->ltype)) {
$cfg = $this->cfg();
$filter = $cfg[$this->ltype];
- $this->whereAddIn('lkey', $filter, 'string');
-
+ if(is_array($filter)){
+ $this->whereAddIn('lkey', $filter, 'string');
+ }
}
}
}
}
@@
-199,7
+200,7
@@
class Pman_Core_DataObjects_I18n extends DB_DataObject
{
$ret = array();
$cfg = $this->cfg();
{
$ret = array();
$cfg = $this->cfg();
- echo '<PRE>';print_r($cfg);
+
//
echo '<PRE>';print_r($cfg);
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';
switch ($t) {
case 'c':
require_once 'I18Nv2/Country.php';