projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_project.php
[Pman.Core]
/
DataObjects
/
Core_setting.php
diff --git
a/DataObjects/Core_setting.php
b/DataObjects/Core_setting.php
index
34936e5
..
05816c4
100644
(file)
--- a/
DataObjects/Core_setting.php
+++ b/
DataObjects/Core_setting.php
@@
-85,16
+85,15
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
return;
}
return;
}
+ $this->initKeys();
+
$c = $this->lookup($a['module'], $a['name']);
$c = $this->lookup($a['module'], $a['name']);
- if($c) {
- return;
- }
- $
this->initKeys()
;
+ $
o = $c ? clone($c) : false
;
- $
s =
DB_DataObject::factory('core_setting');
+ $
c = $c ? $c :
DB_DataObject::factory('core_setting');
- $
s
->setFrom(array(
+ $
c
->setFrom(array(
'module' => $a['module'],
'name' => $a['name'],
'description' => $a['description'],
'module' => $a['module'],
'name' => $a['name'],
'description' => $a['description'],
@@
-104,7
+103,7
@@
class Pman_Core_DataObjects_Core_setting extends DB_DataObject
'is_valid' => 1
));
'is_valid' => 1
));
- $
s
->insert();
+ $
o ? $c->update($o) : $c
->insert();
}
//one key for encrypting all the settings
}
//one key for encrypting all the settings