diff --git a/QvitterPlugin.php b/QvitterPlugin.php
index 6f7cf8a..689ce3e 100644
--- a/QvitterPlugin.php
+++ b/QvitterPlugin.php
@@ -197,6 +197,12 @@ class QvitterPlugin extends Plugin {
array('notice' => '[0-9]+'),
'qvitter');
}
+
+ // if qvitter is opt-out, disable the default register page
+ if(self::settings('enabledbydefault')) {
+ $m->connect('main/register',
+ array('action' => 'qvitter'));
+ }
}
diff --git a/actions/apiqvitternotifications.php b/actions/apiqvitternotifications.php
index 05f700b..bf1aa8c 100644
--- a/actions/apiqvitternotifications.php
+++ b/actions/apiqvitternotifications.php
@@ -91,9 +91,17 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction
foreach($this->notifications as $notification) {
+
// all but follow has an notice
if($notification->ntype != 'follow') {
- $notice = self::twitterSimpleStatusArray(Notice::getKV($notification->notice_id));
+
+ // we need a notice id here, skip this notification if notice id is null
+ if($notification->notice_id === null) {
+ continue;
+ }
+ else {
+ $notice = self::twitterSimpleStatusArray(Notice::getKV($notification->notice_id));
+ }
}
$notifications_populated[] = array(
diff --git a/actions/qvitter.php b/actions/qvitter.php
index a8bfe64..d9e659a 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -386,11 +386,11 @@ class QvitterAction extends ApiAction
-
-
-
+
+
+
-
+