Merge branch 'master' of github.com:shish/shimmie2

2012-02-10 01:29:49 +00:00
parent 34fd9751db f9db22a005
commit c627e564c4
6 changed files with 29 additions and 25 deletions
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@ -40,7 +40,7 @@ class TagEditTheme extends Themelet {
 		$ip = $user->can("view_ip") ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : "";
 		return "
 			<tr>
-				<td>User</td>
+				<td>Uploader</td>
 				<td>
 					<span class='view'><a class='username' href='".make_link("user/$h_owner")."'>$h_owner</a>$ip, $h_date</span>
 					<input class='edit' type='text' name='tag_edit__owner' value='$h_owner'>