@@ -113,9 +113,11 @@ |
||
| 113 | 113 | { |
| 114 | 114 | $member = self::$instance->getById($id); |
| 115 | 115 | |
| 116 | - return $member !== false ? $member : new class() extends ValuesContainer { |
|
| 116 | + return $member !== false ? $member : new class() extends ValuesContainer |
|
| 117 | + { |
|
| 117 | 118 | public function loadContext($display_custom_fields = false) |
| 118 | - {} |
|
| 119 | + { |
|
| 120 | +} |
|
| 119 | 121 | }; |
| 120 | 122 | } |
| 121 | 123 | |
@@ -213,7 +213,7 @@ |
||
| 213 | 213 | { |
| 214 | 214 | throw new \ElkArte\Exceptions\Exception('no_board'); |
| 215 | 215 | } |
| 216 | - if(isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) |
|
| 216 | + if (isset($boardOptions['target_board']) && !isset($boards[$boardOptions['target_board']])) |
|
| 217 | 217 | { |
| 218 | 218 | throw new \ElkArte\Exceptions\Exception('no_board'); |
| 219 | 219 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * @param string $set The data to load (see the constants SET_*) |
| 139 | 139 | * @return bool|int[] The ids of the members loaded |
| 140 | 140 | */ |
| 141 | - public function loadById($users, $set = MemberLoader::SET_NORMAL) |
|
| 141 | + public function loadById($users, $set = MemberLoader::SET_NORMAL) |
|
| 142 | 142 | { |
| 143 | 143 | // Can't just look for no users :P. |
| 144 | 144 | if (empty($users)) |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * @param string $set The data to load (see the constants SET_*) |
| 168 | 168 | * @return bool|int[] The ids of the members loaded |
| 169 | 169 | */ |
| 170 | - public function loadByName($name, $set = MemberLoader::SET_NORMAL) |
|
| 170 | + public function loadByName($name, $set = MemberLoader::SET_NORMAL) |
|
| 171 | 171 | { |
| 172 | 172 | // Can't just look for no users :P. |
| 173 | 173 | if (empty($name)) |
@@ -168,7 +168,7 @@ |
||
| 168 | 168 | if (!empty($this->_post_data)) |
| 169 | 169 | { |
| 170 | 170 | $this->_options['http']['method'] = 'POST'; |
| 171 | - $this->_options['http']['header'][] ='Content-Length: ' . strlen($this->_post_data); |
|
| 171 | + $this->_options['http']['header'][] = 'Content-Length: ' . strlen($this->_post_data); |
|
| 172 | 172 | $this->_options['http']['content'] = $this->_post_data; |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -499,7 +499,7 @@ |
||
| 499 | 499 | |
| 500 | 500 | echo ' |
| 501 | 501 | <div id="admincenter"> |
| 502 | - <h2 class="category_header">', $txt['package_examine_file'], ' : ' , $context['package'], '</h2> |
|
| 502 | + <h2 class="category_header">', $txt['package_examine_file'], ' : ', $context['package'], '</h2> |
|
| 503 | 503 | <h3 class="category_header">', $txt['package_file_contents'], ' ', $context['filename'], ':</h3> |
| 504 | 504 | <div class="content largetext"> |
| 505 | 505 | <code><pre class="file_content prettyprint">', $context['filedata'], '</pre></code> |
@@ -307,7 +307,7 @@ |
||
| 307 | 307 | reloadSettings(); |
| 308 | 308 | |
| 309 | 309 | // Make sure we have ready the list of members for populating it |
| 310 | - MembersList::init(database(), Cache::instance(), ParserWrapper::instance()); |
|
| 310 | + MembersList::init(database(), Cache::instance(), ParserWrapper::instance()); |
|
| 311 | 311 | |
| 312 | 312 | // Our good ole' contextual array, which will hold everything |
| 313 | 313 | if (empty($context)) |
@@ -249,7 +249,7 @@ |
||
| 249 | 249 | |
| 250 | 250 | /** |
| 251 | 251 | * Takes care of the saving process. |
| 252 | - */ |
|
| 252 | + */ |
|
| 253 | 253 | public function action_save() |
| 254 | 254 | { |
| 255 | 255 | global $modSettings; |
@@ -252,18 +252,15 @@ |
||
| 252 | 252 | !empty($modSettings['warning_mute']) |
| 253 | 253 | && |
| 254 | 254 | $modSettings['warning_mute'] <= $this->data['warning'] ? |
| 255 | - 'mute' : |
|
| 256 | - ( |
|
| 255 | + 'mute' : ( |
|
| 257 | 256 | !empty($modSettings['warning_moderate']) |
| 258 | 257 | && |
| 259 | 258 | $modSettings['warning_moderate'] <= $this->data['warning'] ? |
| 260 | - 'moderate' : |
|
| 261 | - ( |
|
| 259 | + 'moderate' : ( |
|
| 262 | 260 | !empty($modSettings['warning_watch']) |
| 263 | 261 | && |
| 264 | 262 | $modSettings['warning_watch'] <= $this->data['warning'] ? |
| 265 | - 'watch' : |
|
| 266 | - '' |
|
| 263 | + 'watch' : '' |
|
| 267 | 264 | ) |
| 268 | 265 | ), |
| 269 | 266 | 'local_time' => standardTime(time() + ($this->data['time_offset'] - User::$info->time_offset) * 3600, false), |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | |
| 354 | 354 | if ($use_wildcards || $maybe_email) |
| 355 | 355 | $email_condition = ' |
| 356 | - OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode( ') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')'; |
|
| 356 | + OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode(') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')'; |
|
| 357 | 357 | else |
| 358 | 358 | $email_condition = ''; |
| 359 | 359 | |
@@ -372,8 +372,8 @@ discard block |
||
| 372 | 372 | LIMIT {int:limit}', |
| 373 | 373 | array( |
| 374 | 374 | 'buddy_list' => User::$info->buddies, |
| 375 | - 'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode( ' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '', |
|
| 376 | - 'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode( ' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '', |
|
| 375 | + 'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode(' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '', |
|
| 376 | + 'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode(' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '', |
|
| 377 | 377 | 'email_condition' => $email_condition, |
| 378 | 378 | 'limit' => $max, |
| 379 | 379 | 'recursive' => true, |