diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
| commit | 10b4eda6f0cbb44fde9fb3158bd174c82467f2ee (patch) | |
| tree | 811d72521d8ad7bfb361030c4d320aa03b17ddea /modules/user | |
| parent | 42c82ef7f081630c15a5d354205896764348a76a (diff) | |
| parent | b0bb107b7ebb5edbf3bec69ae2e716552eb1adf5 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/libraries/Theme_View.php
themes/admin_default/views/admin.html.php
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 542b8b8b..b469f82d 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -66,7 +66,7 @@ <? foreach ($users as $i => $user): ?> <tr id="gUser-<?= $user->id ?>" class="<?= text::alternate("gOddRow", "gEvenRow") ?> user <?= $user->admin ? "admin" : "" ?>"> <td id="user-<?= $user->id ?>" class="core-info gDraggable"> - <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>" + <img src="<?= $user->avatar_url(20, $theme->theme_url("images/avatar.jpg", true)) ?>" title="<?= t("Drag user onto group below to add as a new member") ?>" alt="<?= p::clean($user->name) ?>" width="20" |