Merge commit 'origin/0.9.x' into 0.9.x

2 files changed, 65 insertions, 1 deletions

diff --git a/lib/command.php b/lib/command.php
index 3809c98cc..f7421269d 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -729,7 +729,7 @@ class LoseCommand extends Command
             return;
         }
 
-        $result = Subscription::cancel($this->other, $this->user);
+        $result = Subscription::cancel($this->getProfile($this->other), $this->user->getProfile());
 
         if ($result) {
             $channel->output($this->user, sprintf(_('Unsubscribed  %s'), $this->other));
diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
new file mode 100644
index 000000000..ebb0189e0
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Opens links with rel=external on a new window or tab
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Opens links with rel=external on a new window or tab
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Sarven Capadisli <csarven@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class OpenExternalLinkTargetPlugin extends Plugin
+{
+    function onEndShowScripts($action)
+    {
+        $action->inlineScript('$("a[rel~=external]").click(function(){ window.open(this.href); return false; });');
+
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'OpenExternalLinkTarget',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Sarven Capadisli',
+                            'homepage' => 'http://status.net/wiki/Plugin:OpenExternalLinkTarget',
+                            'rawdescription' =>
+                            _m('Opens external links (i.e., with rel=external) on a new window or tab'));
+        return true;
+    }
+}
+