@@ -1923,7 +1923,7 @@ |
||
1923 | 1923 | /** |
1924 | 1924 | * Initialize the URL generator |
1925 | 1925 | * |
1926 | - * @return object The URL generator object |
|
1926 | + * @return Url_Generator|null The URL generator object |
|
1927 | 1927 | */ |
1928 | 1928 | function initUrlGenerator() |
1929 | 1929 | { |
@@ -716,7 +716,7 @@ |
||
716 | 716 | * |
717 | 717 | * @deprecated since 2.0 - use pollInfoForTopic instead |
718 | 718 | * @param int $id_topic |
719 | - * @return array |
|
719 | + * @return boolean |
|
720 | 720 | */ |
721 | 721 | function pollStatus($id_topic) |
722 | 722 | { |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | /** |
74 | 74 | * Adds a new UrlGenerator (e.g. standard, semantic, etc.) |
75 | 75 | * |
76 | - * @param object|string $generator |
|
76 | + * @param string $generator |
|
77 | 77 | */ |
78 | 78 | public function register($generator) |
79 | 79 | { |
@@ -84,7 +84,6 @@ discard block |
||
84 | 84 | * Initialized the URL generator (i.e. instantiate the class if needed) |
85 | 85 | * and sets the generators according to the types they support. |
86 | 86 | * |
87 | - * @param object|string $generator |
|
88 | 87 | */ |
89 | 88 | protected function _initGen($name) |
90 | 89 | { |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | case 'id_member': |
173 | 173 | $id = $filter['value']['sql']; |
174 | 174 | loadMemberData($id, false, 'minimal'); |
175 | - $context['filter']['value']['html'] = '<a href="' . getUrl('profile', ['action' => 'profile', 'u' => $id, 'name' => $user_profile[$id]['real_name']]) . '">' . $user_profile[$id]['real_name'] . '</a>'; |
|
175 | + $context['filter']['value']['html'] = '<a href="' . getUrl('profile', ['action' => 'profile', 'u' => $id, 'name' => $user_profile[$id]['real_name']]) . '">' . $user_profile[$id]['real_name'] . '</a>'; |
|
176 | 176 | break; |
177 | 177 | case 'url': |
178 | 178 | $context['filter']['value']['html'] = '\'' . strtr(htmlspecialchars((substr($filter['value']['sql'], 0, 1) == '?' ? $scripturl : '') . $filter['value']['sql'], ENT_COMPAT, 'UTF-8'), array('\_' => '_')) . '\''; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $memID = $context['errors'][$id]['member']['id']; |
212 | 212 | $context['errors'][$id]['member']['username'] = $members[$memID]['member_name']; |
213 | 213 | $context['errors'][$id]['member']['name'] = $members[$memID]['real_name']; |
214 | - $context['errors'][$id]['member']['href'] = empty($memID) ? '' : $getUrl('profile', ['action' => 'profile', 'u' => $memID, 'name' => $members[$memID]['real_name']]); |
|
214 | + $context['errors'][$id]['member']['href'] = empty($memID) ? '' : $getUrl('profile', ['action' => 'profile', 'u' => $memID, 'name' => $members[$memID]['real_name']]); |
|
215 | 215 | $context['errors'][$id]['member']['link'] = empty($memID) ? $txt['guest_title'] : '<a href="' . $context['errors'][$id]['member']['href'] . '">' . $context['errors'][$id]['member']['name'] . '</a>'; |
216 | 216 | } |
217 | 217 | } |
@@ -2662,11 +2662,11 @@ |
||
2662 | 2662 | $row['subject'] = censor($row['subject']); |
2663 | 2663 | if (!$row['approved']) |
2664 | 2664 | { |
2665 | - $row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . getUrl('attach', ['action' => 'dlattach', 'attach' => $row['id_attach'], 'name' => $row['filename'], 'topic' => $row['id_topic'], 'subject' => $row['subject'] ]) . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']); |
|
2665 | + $row['filename'] = str_replace(array('{attachment_link}', '{txt_awaiting}'), array('<a href="' . getUrl('attach', ['action' => 'dlattach', 'attach' => $row['id_attach'], 'name' => $row['filename'], 'topic' => $row['id_topic'], 'subject' => $row['subject']]) . '">' . $row['filename'] . '</a>', $txt['awaiting_approval']), $settings['attachments_awaiting_approval']); |
|
2666 | 2666 | } |
2667 | 2667 | else |
2668 | 2668 | { |
2669 | - $row['filename'] = '<a href="' . getUrl('attach', ['action' => 'dlattach', 'attach' => $row['id_attach'], 'name' => $row['filename'], 'topic' => $row['id_topic'], 'subject' => $row['subject']]) . '">' . $row['filename'] . '</a>'; |
|
2669 | + $row['filename'] = '<a href="' . getUrl('attach', ['action' => 'dlattach', 'attach' => $row['id_attach'], 'name' => $row['filename'], 'topic' => $row['id_topic'], 'subject' => $row['subject']]) . '">' . $row['filename'] . '</a>'; |
|
2670 | 2670 | } |
2671 | 2671 | |
2672 | 2672 | $attachments[] = array( |
@@ -614,7 +614,7 @@ |
||
614 | 614 | |
615 | 615 | // Set the previous and the next week's links. |
616 | 616 | $calendarGrid['previous_week']['href'] = getUrl('action', ['action' => 'calendar', 'viewweek', 'year' => $calendarGrid['previous_week']['year'], 'month' => $calendarGrid['previous_week']['month'], 'day' => $calendarGrid['previous_week']['day']]); |
617 | - $calendarGrid['next_week']['href'] = getUrl('action', ['action' => 'calendar', 'viewweek' ,'year' => $calendarGrid['next_week']['year'], 'month' => $calendarGrid['next_week']['month'], 'day' => $calendarGrid['next_week']['day']]); |
|
617 | + $calendarGrid['next_week']['href'] = getUrl('action', ['action' => 'calendar', 'viewweek', 'year' => $calendarGrid['next_week']['year'], 'month' => $calendarGrid['next_week']['month'], 'day' => $calendarGrid['next_week']['day']]); |
|
618 | 618 | |
619 | 619 | return $calendarGrid; |
620 | 620 | } |