Merge branch 'delete_group_logo' into 'nightly'

[quix0rs-gnu-social.git] / plugins / LinkPreview / LinkPreviewPlugin.php

diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index 652afdbdf961351cf01e0f8eab9f777d9700a927..25e31f3f7918107284ce852ffcd464544e0e0e18 100644 (file)
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -29,12 +29,12 @@ if (!defined('STATUSNET')) {
  */
 class LinkPreviewPlugin extends Plugin
 {
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LinkPreview',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Brion Vibber',
-                            'homepage' => 'http://status.net/wiki/Plugin:LinkPreview',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LinkPreview',
                             'rawdescription' =>
                             // TRANS: Plugin description.
                             _m('UI extension for previewing thumbnails from links.'));
@@ -52,12 +52,7 @@ class LinkPreviewPlugin extends Plugin
     {
         $user = common_current_user();
         if ($user && common_config('attachments', 'process_links')) {
-            if (common_config('site', 'minify')) {
-                $js = 'linkpreview.min.js';
-            } else {
-                $js = 'linkpreview.js';
-            }
-            $action->script($this->path($js));
+            $action->script($this->path('js/linkpreview.js'));
             $data = json_encode(array(
                 'api' => common_local_url('oembedproxy'),
                 'width' => common_config('attachments', 'thumbwidth'),
@@ -71,11 +66,11 @@ class LinkPreviewPlugin extends Plugin
     /**
      * Hook for RouterInitialized event.
      *
-     * @param Net_URL_Mapper $m URL mapper
+     * @param URLMapper $m URL mapper
      *
      * @return boolean hook return
      */
-    function onStartInitializeRouter($m)
+    public function onStartInitializeRouter(URLMapper $m)
     {
         $m->connect('main/oembed/proxy',
                 array('action' => 'oembedproxy'));