Merge branch 'master' into nightly

[quix0rs-gnu-social.git] / plugins / DomainStatusNetwork / DomainStatusNetworkPlugin.php

diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index 732a85f373fc2d4de274d2d639b2ea3d693e41b5..24ca6c90b0c319e8c0c9b5fbc2a23aa4e2acb596 100644 (file)
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -66,7 +66,7 @@ class DomainStatusNetworkPlugin extends Plugin
             }
         }
 
-        $nickname = StatusNet::currentSite();
+        $nickname = GNUsocial::currentSite();
 
         if (empty($nickname)) {
             $this->log(LOG_WARNING, "No current site");
@@ -190,12 +190,12 @@ class DomainStatusNetworkPlugin extends Plugin
         return null;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainStatusNetwork',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:DomainStatusNetwork',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainStatusNetwork',
                             'rawdescription' =>
                             // TRANS: Plugin description.
                             _m('A plugin that maps a single status_network to an email domain.'));
@@ -212,7 +212,7 @@ class DomainStatusNetworkPlugin extends Plugin
             return false;
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = User::getKV('email', $email);
 
@@ -242,7 +242,7 @@ class DomainStatusNetworkPlugin extends Plugin
             Status_network::$wildcard = $config['WILDCARD'];
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $confirm = EmailRegistrationPlugin::registerEmail($email);
 
@@ -259,7 +259,7 @@ class DomainStatusNetworkPlugin extends Plugin
             throw new ClientException(_("No such site."));
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = common_check_user($email, $password);
 
@@ -294,7 +294,7 @@ class DomainStatusNetworkPlugin extends Plugin
             throw new NoSuchUserException(array('email' => $email));
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = User::getKV('email', $email);