diff options
| author | Sem <sembrestels@riseup.net> | 2013-11-08 06:44:30 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-11-08 06:44:30 +0100 |
| commit | 79e75345e812e3110e7053ca5ebec20294d3eccb (patch) | |
| tree | acc5969af6b5c12274059eb7daefc83dba546a82 /views/default/core | |
| parent | 2893ba1d10fb829ac7efb0c450840cb7b00d2eb2 (diff) | |
| parent | 97e15a3a473728422f596d3c9b1da18631f992e0 (diff) | |
| download | elgg-79e75345e812e3110e7053ca5ebec20294d3eccb.tar.gz elgg-79e75345e812e3110e7053ca5ebec20294d3eccb.tar.bz2 | |
Merge branch '1.8'
Diffstat (limited to 'views/default/core')
| -rw-r--r-- | views/default/core/account/login_box.php | 1 | ||||
| -rw-r--r-- | views/default/core/account/login_dropdown.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php index 1fe452e69..51b13398b 100644 --- a/views/default/core/account/login_box.php +++ b/views/default/core/account/login_box.php @@ -6,6 +6,7 @@ * @subpackage Core * * @uses $vars['module'] The module name. Default: aside + * @override views/default/core/account/login_box.php */ $module = elgg_extract('module', $vars, 'aside'); diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php index 7882fde02..c3add2924 100644 --- a/views/default/core/account/login_dropdown.php +++ b/views/default/core/account/login_dropdown.php @@ -1,6 +1,8 @@ <?php /** * Elgg drop-down login form + * + * @override views/default/core/account/login_dropdown.php */ if (elgg_is_logged_in()) { |