diff options
| author | mrjive <mrjive@mrjive.it> | 2016-01-15 20:58:10 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-01-15 20:58:10 +0100 |
| commit | 763c700372ee91f3f840c6fba915cb4d941c34a0 (patch) | |
| tree | 1d7e4a7f19825b6417764e2c46d3cd109f94b075 /mod/connedit.php | |
| parent | 2696deb2a18ba06593657a2317176baa26821708 (diff) | |
| parent | 2498df68c716ec6ed80b5547c721ca9741a85572 (diff) | |
| download | volse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.tar.gz volse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.tar.bz2 volse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.zip | |
Merge pull request #17 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/connedit.php')
| -rw-r--r-- | mod/connedit.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 77b54d262..cb785fc31 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -305,6 +305,9 @@ function connedit_post(&$a) { connedit_clone($a); + if(($_REQUEST['pending']) && (!$_REQUEST['done'])) + goaway($a->get_baseurl(true) . '/connections/ifpending'); + return; } @@ -711,10 +714,6 @@ function connedit_content(&$a) { '$slide' => $slide, '$affinity' => $affinity, '$pending_label' => t('Connection Pending Approval'), - '$pending_modal_title' => t('Connection Request'), - '$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']), - '$pending_modal_approve' => t('Approve'), - '$pending_modal_dismiss' => t('Approve Later'), '$is_pending' => (intval($contact['abook_pending']) ? 1 : ''), '$unapproved' => $unapproved, '$inherited' => t('inherited'), |