Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / approvesubform.php

diff --git a/lib/approvesubform.php b/lib/approvesubform.php
index 820f648d0fa728e2a37c26c52d53628d184386f9..c034effc0033bbe2443d7fd5b1adcb1d37b1804e 100644 (file)
--- a/lib/approvesubform.php
+++ b/lib/approvesubform.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Form for leaving a group
+ * Form for approving or reject a pending subscription request
  *
  * PHP version 5
  *
@@ -28,14 +28,10 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/form.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
- * Form for leaving a group
+ * Form for approving or reject a pending subscription request
  *
  * @category Form
  * @package  StatusNet
@@ -107,8 +103,8 @@ class ApproveSubForm extends Form
     function formActions()
     {
         // TRANS: Submit button text to accept a subscription request on approve sub form.
-        $this->out->submit('approve', _m('BUTTON','Accept'));
+        $this->out->submit($this->id().'-approve', _m('BUTTON','Accept'), 'submit approve', 'approve');
         // TRANS: Submit button text to reject a subscription request on approve sub form.
-        $this->out->submit('cancel', _m('BUTTON','Reject'));
+        $this->out->submit($this->id().'-cancel', _m('BUTTON','Reject'), 'submit cancel', 'cancel');
     }
 }