diff options
| author | Cesar G <prototech91@gmail.com> | 2014-04-08 05:33:24 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-23 09:11:40 -0700 |
| commit | 3fec8dff2cc22bc56a6d909be6df8742ab145c6f (patch) | |
| tree | f382c9bb4ef84a5334c7fc2f70c8819cfb1141ed /phpBB | |
| parent | 333a18d8466d0299415520ca0436bfe6c005a747 (diff) | |
| download | forums-3fec8dff2cc22bc56a6d909be6df8742ab145c6f.tar forums-3fec8dff2cc22bc56a6d909be6df8742ab145c6f.tar.gz forums-3fec8dff2cc22bc56a6d909be6df8742ab145c6f.tar.bz2 forums-3fec8dff2cc22bc56a6d909be6df8742ab145c6f.tar.xz forums-3fec8dff2cc22bc56a6d909be6df8742ab145c6f.zip | |
[ticket/10737] Set the username as the input value instead of redirecting.
PHPBB3-10737
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 8 | ||||
| -rw-r--r-- | phpBB/memberlist.php | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index f9cc3f7a91..4a16cfd73e 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -665,11 +665,11 @@ phpbb.search.showResults = function(results, el, container, callback) { $.each(results, function(i, item) { row = tpl.clone(); - row.find('.search-result').html(item.result); + row.find('.search-result').html(item.display); - if (callback === 'function') { + if (typeof callback === 'function') { callback.call(this, el, item, row, container); - } + } row.appendTo(resultContainer).show(); }); container.show(); @@ -836,7 +836,7 @@ phpbb.addAjaxCallback = function(id, callback) { * This callback handles live member searches. */ phpbb.addAjaxCallback('member_search', function(res) { - phpbb.search.handleResponse(res, $(this), false); + phpbb.search.handleResponse(res, $(this), false, phpbb.getFunctionByName('phpbb.search.setValueOnClick')); }); /** diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 3cc92b5fe0..4103855f43 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -996,8 +996,9 @@ switch ($mode) { $user_list[] = array( 'user_id' => (int) $row['user_id'], - 'username' => $row['username'], - 'result' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), + 'result' => $row['username'], + 'username_full' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), + 'display' => get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour']), ); } $db->sql_freeresult($result); |