diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-09 20:31:14 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-09 20:31:14 -0800 |
| commit | a9bb4ab4eb9c2883b5998538406bea4e5c99aeca (patch) | |
| tree | 61d564360e19d717e4555b5e831cf9a33bcec41c /modules | |
| parent | 4f8728029dfc283f5d26328ec21a2db455e97651 (diff) | |
| parent | 64f5a98bd60410e54b6d0c59c713bb7e3eff0a83 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/image_block/helpers/image_block_installer.php | 2 | ||||
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php index 06668dc2..04a15619 100644 --- a/modules/image_block/helpers/image_block_installer.php +++ b/modules/image_block/helpers/image_block_installer.php @@ -19,13 +19,11 @@ */ class image_block_installer { static function install() { - block_manager::add("site.sidebar", "image_block", "random_image"); module::set_version("image_block", 2); } static function upgrade($version) { if ($version == 1) { - block_manager::add("site.sidebar", "image_block", "random_image"); module::set_version("image_block", 2); } } diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 661f1532..18ad9403 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -85,7 +85,7 @@ <td> <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?> </td> - <td class="g-actions"> + <td> <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>" open_text="<?= t("Close") ?>" class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> |