aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-06-20 01:21:34 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-06-20 01:21:34 +0200
commitda958ccb4f3e5f4936453bcc46709dd0ec3b0abb (patch)
tree647a5cf0c1a518d42a907424b4ef77feb9349cfd
parentd72b5aaf1bd6d959c2b06e923ab76fc1f370e455 (diff)
parente47e36266d4a2a8543a3df084182c719abe4132c (diff)
downloadforums-da958ccb4f3e5f4936453bcc46709dd0ec3b0abb.tar
forums-da958ccb4f3e5f4936453bcc46709dd0ec3b0abb.tar.gz
forums-da958ccb4f3e5f4936453bcc46709dd0ec3b0abb.tar.bz2
forums-da958ccb4f3e5f4936453bcc46709dd0ec3b0abb.tar.xz
forums-da958ccb4f3e5f4936453bcc46709dd0ec3b0abb.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11094] Add textbox for jabber while memberlist search
-rw-r--r--phpBB/styles/prosilver/template/memberlist_search.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 61bfd630ff..a4468b4af4 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -74,6 +74,10 @@ function insert_single(user)
<dt><label for="msn">{L_MSNM}{L_COLON}</label></dt>
<dd><input type="text" name="msn" id="msn" value="{MSNM}" class="inputbox" /></dd>
</dl>
+ <dl>
+ <dt><label for="jabber">{L_JABBER}:</label></dt>
+ <dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
+ </dl>
</fieldset>
<fieldset class="fields1 column2">