Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber
2010-10-04 13:06:40 -07:00
7 changed files with 68 additions and 24 deletions

View File

@@ -38,7 +38,7 @@ if (empty($args[0]) || !Validate::uri($args[0])) {
$feedurl = $args[0];
$sub = FeedSub::staticGet('topic', $feedurl);
$sub = FeedSub::staticGet('uri', $feedurl);
if (!$sub) {
print "Feed $feedurl is not subscribed.\n";
exit(1);
@@ -57,7 +57,7 @@ if ($ok) {
print "Could not confirm.\n";
}
$sub2 = FeedSub::staticGet('topic', $feedurl);
$sub2 = FeedSub::staticGet('uri', $feedurl);
print "\n";
print "New state:\n";

View File

@@ -45,7 +45,7 @@ $skip = have_option('skip') ? intval(get_option_value('skip')) : 0;
$count = have_option('count') ? intval(get_option_value('count')) : 0;
$sub = FeedSub::staticGet('topic', $feedurl);
$sub = FeedSub::staticGet('uri', $feedurl);
if (!$sub) {
print "Feed $feedurl is not subscribed.\n";
exit(1);