projects
/
banana.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hum, should avoid spool corruption when a message is canceled.
[banana.git]
/
banana
/
spool.inc.php
diff --git
a/banana/spool.inc.php
b/banana/spool.inc.php
index
efb2a04
..
86719f5
100644
(file)
--- a/
banana/spool.inc.php
+++ b/
banana/spool.inc.php
@@
-430,6
+430,7
@@
class BananaSpool
// Remove from the message tree
if (!is_null($parent)) {
// Remove from the message tree
if (!is_null($parent)) {
+ $time = time();
foreach ($parent->children as $key=>&$child) {
if ($child === $overview) {
unset($parent->children[$key]);
foreach ($parent->children as $key=>&$child) {
if ($child === $overview) {
unset($parent->children[$key]);
@@
-437,12
+438,12
@@
class BananaSpool
}
}
if (sizeof($overview->children)) {
}
}
if (sizeof($overview->children)) {
- $parent->children = array_merge($parent->children, $overview->children);
foreach ($overview->children as &$child) {
foreach ($overview->children as &$child) {
+ $parent->children[] =& $child;
+ $child->time = $time;
$child->parent =& $parent;
}
}
$child->parent =& $parent;
}
}
- $time = time();
while (!is_null($parent)) {
$parent->desc--;
$parent->time = $time;
while (!is_null($parent)) {
$parent->desc--;
$parent->time = $time;