projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[Pman.Core]
/
UpdateDatabase.php
diff --git
a/UpdateDatabase.php
b/UpdateDatabase.php
index
77b2a92
..
ee26b73
100644
(file)
--- a/
UpdateDatabase.php
+++ b/
UpdateDatabase.php
@@
-817,7
+817,7
@@
class Pman_Core_UpdateDatabase extends Pman
}
}
- function initEmails($templateDir, $emails)
+ function initEmails($templateDir, $emails
, $mapping = false
)
{
HTML_FlexyFramework::get()->generateDataobjectsCache(true);
{
HTML_FlexyFramework::get()->generateDataobjectsCache(true);
@@
-827,7
+827,7
@@
class Pman_Core_UpdateDatabase extends Pman
$update = $cm->get('name', $name);
$old = clone($cm);
$update = $cm->get('name', $name);
$old = clone($cm);
- if (empty($cm->bcc_group)) {
+ if (empty($cm->bcc_group
_id
)) {
if (empty($data['bcc_group'])) {
$this->jerr("missing bcc_group for template $name");
}
if (empty($data['bcc_group'])) {
$this->jerr("missing bcc_group for template $name");
}
@@
-856,7
+856,7
@@
class Pman_Core_UpdateDatabase extends Pman
if (
!empty($data['to_group']) &&
if (
!empty($data['to_group']) &&
- (!isset($cm->to_group
) || !empty($cm->to_group
))
+ (!isset($cm->to_group
_id) || !empty($cm->to_group_id
))
) {
$gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
) {
$gp = DB_DataObject::Factory('core_group')->lookup('name',$data['to_group']);
@@
-864,7
+864,7
@@
class Pman_Core_UpdateDatabase extends Pman
$this->jerr("to_group {$data['to_group']} does not exist when importing template $name");
}
$this->jerr("to_group {$data['to_group']} does not exist when importing template $name");
}
- $cm->to_group = $gp->id;
+ $cm->to_group
_id
= $gp->id;
}
if(
}
if(
@@
-909,7
+909,7
@@
class Pman_Core_UpdateDatabase extends Pman
require_once 'Pman/Core/Import/Core_email.php';
$x = new Pman_Core_Import_Core_email();
require_once 'Pman/Core/Import/Core_email.php';
$x = new Pman_Core_Import_Core_email();
- $x->updateOrCreateEmail('', $opts, $cm);
+ $x->updateOrCreateEmail('', $opts, $cm
, $mapping
);
echo "email: {$name} - CREATED\n";
}
echo "email: {$name} - CREATED\n";
}