Changeset 545 for branches/stable/templates/user.tmpl

Timestamp:

12/10/13 17:47:44 (10 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge reverse DNS and location work; 2 of mumble

• from r263 through r416

Numerous conflicts due to hand-copy or partial merges

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates/user.tmpl (modified) (1 diff)

branches/stable/templates/user.tmpl

@@ -16 +16 @@
 <table border="0" cellspacing="2" cellpadding="2" width="450">
 <TMPL_IF add_failed>    <tr>
-                <td class="errhead" colspan="2">Error <TMPL_IF add>adding<TMPL_ELSE>updating</TMPL_IF> user <TMPL_VAR NAME=uname>: <TMPL_VAR NAME=errmsg></td>
+                <td class="errhead" colspan="2"><TMPL_VAR NAME=errmsg></td>
         </tr></TMPL_IF>
         <tr class="darkrowheader"><td colspan="2" align="center"><TMPL_IF add>Add<TMPL_ELSE>Edit</TMPL_IF> User</td></tr>