summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/apitimelinegroup.php2
-rw-r--r--classes/User_group.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index d0af49844..e30a08fb5 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -140,7 +140,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
// @todo set all this Atom junk up inside the feed class
- $atom->setId($id);
+ #$atom->setId($id);
$atom->setTitle($title);
$atom->setSubtitle($subtitle);
$atom->setLogo($logo);
diff --git a/classes/User_group.php b/classes/User_group.php
index 1a5ddf253..0460c9870 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -455,6 +455,11 @@ class User_group extends Memcached_DataObject
$group = new User_group();
$group->query('BEGIN');
+
+ if (empty($uri)) {
+ // fill in later...
+ $uri = null;
+ }
$group->nickname = $nickname;
$group->fullname = $fullname;