Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x

This commit is contained in:
Brion Vibber 2009-10-13 11:57:58 -07:00
commit 7ea73ccad6
2 changed files with 7 additions and 8 deletions

View File

@ -27,6 +27,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
} }
define('STATUSNET', true); define('STATUSNET', true);
define('LACONICA', true); // compatibility
// Set various flags so we don't time out on long-running processes // Set various flags so we don't time out on long-running processes

View File

@ -24,17 +24,17 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
common_log(LOG_INFO, 'Fixing up conversations.'); common_log(LOG_INFO, 'Fixing up conversations.');
$nid = new Notice(); $notice = new Notice();
$nid->query('select id, reply_to from notice where conversation is null'); $notice->query('select id, reply_to from notice where conversation is null');
while ($nid->fetch()) { while ($notice->fetch()) {
$cid = null; $cid = null;
$notice = new Notice(); $orig = clone($notice);
if (empty($nid->reply_to)) { if (empty($notice->reply_to)) {
$cid = $nid->id; $notice->conversation = $notice->id;
} else { } else {
$reply = Notice::staticGet('id', $notice->reply_to); $reply = Notice::staticGet('id', $notice->reply_to);
@ -61,9 +61,7 @@ while ($nid->fetch()) {
continue; continue;
} }
$notice = null;
$orig = null; $orig = null;
unset($notice);
unset($orig); unset($orig);
print ".\n"; print ".\n";