diff options
| -rw-r--r-- | engine/lib/views.php | 11 | ||||
| -rw-r--r-- | mod/categories/views/default/categories.php | 2 | ||||
| -rw-r--r-- | mod/categories/views/default/categories/list.php | 2 | ||||
| -rw-r--r-- | mod/sitepages/views/default/sitepages/keywords/userlist.php | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php index 0a9669d2f..4f6088859 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -318,11 +318,12 @@ function elgg_view_exists($view, $viewtype = '', $recurse = true) { * Views are rendered by a template handler and returned as strings. * * Views are called with a special $vars variable set, - * which includes any variables passed as the second parameter, - * as well as some defaults: - * - All $_SESSION vars merged to $vars array. - * - $vars['config'] The $CONFIG global. (Use {@link get_config()} instead). - * - $vars['url'] The site URL. + * which includes any variables passed as the second parameter. + * For backward compatbility, the following variables are also set but we + * recommend that you do not use them: + * - $vars['config'] The $CONFIG global. (Use {@link elgg_get_config()} instead). + * - $vars['url'] The site URL. (use {@link elgg_get_site_url()} instead). + * - $vars['user'] The logged in user. (use {@link get_loggedin_user()} instead). * * Custom template handlers can be set with {@link set_template_handler()}. * diff --git a/mod/categories/views/default/categories.php b/mod/categories/views/default/categories.php index eb81a7311..f69283e9f 100644 --- a/mod/categories/views/default/categories.php +++ b/mod/categories/views/default/categories.php @@ -9,7 +9,7 @@ if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) { $selected_categories = $vars['entity']->universal_categories; } -$categories = $vars['config']->site->categories; +$categories = elgg_get_site_entity()->categories; if (empty($categories)) { $categories = array(); } diff --git a/mod/categories/views/default/categories/list.php b/mod/categories/views/default/categories/list.php index 9b62eff51..7a6dadff4 100644 --- a/mod/categories/views/default/categories/list.php +++ b/mod/categories/views/default/categories/list.php @@ -1,6 +1,6 @@ <?php -$categories = $vars['config']->site->categories; +$categories = elgg_get_site_entity()->categories; if ($categories) { if (!is_array($categories)) { diff --git a/mod/sitepages/views/default/sitepages/keywords/userlist.php b/mod/sitepages/views/default/sitepages/keywords/userlist.php index 231fc7b1c..64c3d82ac 100644 --- a/mod/sitepages/views/default/sitepages/keywords/userlist.php +++ b/mod/sitepages/views/default/sitepages/keywords/userlist.php @@ -5,6 +5,8 @@ * @package SitePages */ +$db_prefix = elgg_get_config('dbprefix'); + $only_with_avatars = (isset($vars['only_with_avatars'])) ? $vars['only_with_avatars'] : TRUE; $list_type = (isset($vars['list_type'])) ? $vars['list_type'] : 'new'; $limit = (isset($vars['limit'])) ? $vars['limit'] : 10; @@ -26,7 +28,7 @@ switch ($list_type) { case 'online': // show people with a last action of < 10 minutes. $last_action = time() - 10 * 60; - $options['joins'] = array("JOIN {$vars['config']->dbprefix}users_entity ue on ue.guid = e.guid"); + $options['joins'] = array("JOIN {$db_prefix}users_entity ue on ue.guid = e.guid"); $options['wheres'] = array("ue.last_action > $last_action"); break; |