aboutsummaryrefslogtreecommitdiff
path: root/mod/groups
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-02-13 20:05:00 +0100
committerSem <sembrestels@riseup.net>2013-02-13 20:05:00 +0100
commit9a084e624ee1d42a19eefd5d46cd0b71c1bae339 (patch)
treec44efe5696230f3da027267a930abdc0663a2dd7 /mod/groups
parent70da30e4f768043f6d0c273e74c7c9a2136519a5 (diff)
parent3d163edf0f9d4d751ea212c28ffe771db482fe55 (diff)
downloadelgg-9a084e624ee1d42a19eefd5d46cd0b71c1bae339.tar.gz
elgg-9a084e624ee1d42a19eefd5d46cd0b71c1bae339.tar.bz2
Merge branch 'groups-upgrade-fix' of git://github.com/sembrestels/Elgg into foxglove-2
Diffstat (limited to 'mod/groups')
-rw-r--r--mod/groups/upgrades/2011030101.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/groups/upgrades/2011030101.php b/mod/groups/upgrades/2011030101.php
index 55edb1a16..3199d76ba 100644
--- a/mod/groups/upgrades/2011030101.php
+++ b/mod/groups/upgrades/2011030101.php
@@ -40,7 +40,8 @@ function groups_2011030101($topic) {
$annotation = $topic->getAnnotations('group_topic_post', 1);
if (!$annotation) {
// no text for this forum post so we delete (probably caused by #2624)
- return $topic->delete();
+ $topic->delete();
+ return;
}
$topic->description = $annotation[0]->value;