projects
/
Pman.Xtuple
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a062b2d
)
UpdateDatabase.php
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Nov 2013 06:16:42 +0000
(14:16 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Nov 2013 06:16:42 +0000
(14:16 +0800)
UpdateDatabase.php
patch
|
blob
|
history
diff --git
a/UpdateDatabase.php
b/UpdateDatabase.php
index
65711ea
..
4230011
100644
(file)
--- a/
UpdateDatabase.php
+++ b/
UpdateDatabase.php
@@
-92,13
+92,8
@@
class Pman_Xtuple_UpdateDatabase extends Pman
}
function importFromArray($db, $file)
{
-
-
$data= json_decode(file_get_contents($file),true);
-
DB_DataObject::factory('$db')->importFromArray($this);
-
-
}
@@
-108,7
+103,7
@@
class Pman_Xtuple_UpdateDatabase extends Pman
$this->opts = $opt;
-
+ require_once 'Pman/Core/UpdateDatabase.php';
foreach($this->opts as $o=>$v) {
if (!preg_match('/^json-/', $o) || empty($v)) {
continue;