|
@@ -34,7 +34,7 @@ discard block |
|
|
block discarded – undo |
|
34
|
34
|
|
|
35
|
35
|
// Catch first the configuration option for showing editing interface instead |
|
36
|
36
|
// of redirecting administrators |
|
37
|
|
- if ( $this->_topic->can_do('net.nemein.redirector:noredirect') |
|
|
37
|
+ if ($this->_topic->can_do('net.nemein.redirector:noredirect') |
|
38
|
38
|
&& !$this->_config->get('admin_redirection')) { |
|
39
|
39
|
return new midcom_response_relocate($this->router->generate('edit', ['tinyurl' => $tinyurl])); |
|
40
|
40
|
} |
|
@@ -68,8 +68,8 @@ discard block |
|
|
block discarded – undo |
|
68
|
68
|
{ |
|
69
|
69
|
$data['url'] = net_nemein_redirector_viewer::topic_links_to($this->_config); |
|
70
|
70
|
|
|
71
|
|
- if ( $this->_config->get('redirection_type') !== null |
|
72
|
|
- && ( !$this->_topic->can_do('net.nemein.redirector:noredirect') |
|
|
71
|
+ if ($this->_config->get('redirection_type') !== null |
|
|
72
|
+ && (!$this->_topic->can_do('net.nemein.redirector:noredirect') |
|
73
|
73
|
|| $this->_config->get('admin_redirection'))) { |
|
74
|
74
|
return $this->redirect($data['url']); |
|
75
|
75
|
} |
Please login to merge, or discard this patch.