diff options
author | 2008-12-23 13:53:13 +0000 | |
---|---|---|
committer | 2008-12-23 13:53:13 +0000 | |
commit | 7e95a3ee6c6f09e0440d6375ddd128a329d02058 (patch) | |
tree | 7f1c039e086f8d3b5214aed54ca36340ca604c86 /phpBB/styles/prosilver | |
parent | Remove cache files after each test, ensure they are not included in the cover... (diff) | |
download | phpbb-7e95a3ee6c6f09e0440d6375ddd128a329d02058.tar.gz phpbb-7e95a3ee6c6f09e0440d6375ddd128a329d02058.tar.bz2 phpbb-7e95a3ee6c6f09e0440d6375ddd128a329d02058.zip |
merge in r9090, r9170, r9174, r9179
git-svn-id: file:///svn/phpbb/trunk@9214 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/prosilver')
-rw-r--r-- | phpBB/styles/prosilver/template/mcp_front.html | 2 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/memberlist_search.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 9e8d0bba40..6f048d1a2d 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -129,7 +129,7 @@ </tr> <!-- BEGINELSE --> <tr> - <td colspan="5">{L_NO_ENTRIES}</td> + <td colspan="6">{L_NO_ENTRIES}</td> </tr> <!-- END log --> </tbody> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 1d1d45bf8e..6546bee8dd 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -66,8 +66,8 @@ function insert_single(user) <dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd> </dl> <dl> - <dt><label for="yim">{L_YIM}:</label></dt> - <dd><input type="text" name="yim" id="yim" value="{YIM}" class="inputbox" /></dd> + <dt><label for="yahoo">{L_YIM}:</label></dt> + <dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd> </dl> <dl> <dt><label for="msn">{L_MSNM}:</label></dt> |