summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-17 12:15:12 -0700
committerBrion Vibber <brion@pobox.com>2010-03-17 12:15:12 -0700
commitca5612c451e4dabde107ff2cfbc737a2f69136df (patch)
treef404c43fa8583f026f8c9a472141a48be30d4e8e
parent22f827134c3be845494bebd76bda9e4a074e710b (diff)
parentdacd0f3e6df020eda81d60139ac88437fed3352e (diff)
Merge branch 'master' into testing
-rw-r--r--classes/Subscription.php4
-rwxr-xr-xscripts/fixup_files.php77
2 files changed, 79 insertions, 2 deletions
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 9cef2df1a..5ac95f922 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -105,8 +105,8 @@ class Subscription extends Memcached_DataObject
$auto = new Subscription();
- $auto->subscriber = $subscriber->id;
- $auto->subscribed = $other->id;
+ $auto->subscriber = $other->id;
+ $auto->subscribed = $subscriber->id;
$auto->created = common_sql_now();
$result = $auto->insert();
diff --git a/scripts/fixup_files.php b/scripts/fixup_files.php
new file mode 100755
index 000000000..18feaf221
--- /dev/null
+++ b/scripts/fixup_files.php
@@ -0,0 +1,77 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$longoptions = array('dry-run');
+
+$helptext = <<<END_OF_USERROLE_HELP
+fixup_files.php [options]
+Patches up file entries with corrupted types and titles (the "h bug").
+
+ --dry-run look but don't touch
+
+END_OF_USERROLE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$dry = have_option('dry-run');
+
+$f = new File();
+$f->title = 'h';
+$f->mimetype = 'h';
+$f->size = 0;
+$f->protected = 0;
+$f->find();
+echo "Found $f->N bad items:\n";
+
+while ($f->fetch()) {
+ echo "$f->id $f->url";
+
+ $data = File_redirection::lookupWhere($f->url);
+ if ($dry) {
+ if (is_array($data)) {
+ echo " (unchanged)\n";
+ } else {
+ echo " (unchanged, but embedding lookup failed)\n";
+ }
+ } else {
+ // NULL out the mime/title/size/protected fields
+ $sql = sprintf("UPDATE file " .
+ "SET mimetype=null,title=null,size=null,protected=null " .
+ "WHERE id=%d",
+ $f->id);
+ $f->query($sql);
+ $f->decache();
+
+ if (is_array($data)) {
+ if ($f->saveOembed($data, $f->url)) {
+ echo " (ok)\n";
+ } else {
+ echo " (ok, no embedding data)\n";
+ }
+ } else {
+ echo " (ok, but embedding lookup failed)\n";
+ }
+ }
+}
+
+echo "done.\n";
+