these still won't work, but at least remove completely deprecated functionality

diff --git a/content/bin/tag.php b/content/bin/tag.php
index 43030d2..f88b0df 100644 (file)
--- a/content/bin/tag.php
+++ b/content/bin/tag.php
@@ -1,7 +1,6 @@
 <?php
 
-define('AUTH_HANDLER', true);
-require $CONTENT_DIR . 'lib/Tags/Tagger.php';
+require $CONTENT_DIR . 'lib/Tagger.php';
 
 $options = array(
     new Horde_Argv_Option('-u', '--user-id', array('type' => 'int')),
@@ -16,6 +15,7 @@ if (!count($tags)) {
     throw new InvalidArgumentException('List at least one tag to add.');
 }
 
-$tagger = new Content_Tagger(array('dbAdapter' => Horde_Db::getAdapter()));
+/* @TODO Switch to using the TagController */
+$tagger = new Content_Tagger();
 $tagger->tag($opts->user_id, $opts->object_id, $tags);
 exit(0);

diff --git a/content/bin/untag.php b/content/bin/untag.php
index 8e38aed..78c8bf4 100644 (file)
--- a/content/bin/untag.php
+++ b/content/bin/untag.php
@@ -1,7 +1,6 @@
 <?php
 
-define('AUTH_HANDLER', true);
-require $CONTENT_DIR . 'lib/Tags/Tagger.php';
+require $CONTENT_DIR . 'lib/Tagger.php';
 
 $options = array(
     new Horde_Argv_Option('-u', '--user-id', array('type' => 'int')),
@@ -16,6 +15,7 @@ if (!count($tags)) {
     throw new InvalidArgumentException('List at least one tag to remove.');
 }
 
-$tagger = new Content_Tagger(array('dbAdapter' => Horde_Db::getAdapter()));
+/* @TODO Switch to using the TagController */
+$tagger = new Content_Tagger();
 $tagger->untag($opts->user_id, $opts->object_id, $tags);
 exit(0);