aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 12:35:58 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 12:35:58 +0000
commitfe113218b2b82338f6294cd2f2ba6a11d4bdf6a1 (patch)
tree62c46a9e29666e8d79e18672c868c7759461e4f1 /mod
parentbf39908f4d587785a197de80b528e73c43ce99d9 (diff)
downloadelgg-fe113218b2b82338f6294cd2f2ba6a11d4bdf6a1.tar.gz
elgg-fe113218b2b82338f6294cd2f2ba6a11d4bdf6a1.tar.bz2
removed uses of $vars[config] in views
git-svn-id: http://code.elgg.org/elgg/trunk@8004 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/categories/views/default/categories.php2
-rw-r--r--mod/categories/views/default/categories/list.php2
-rw-r--r--mod/sitepages/views/default/sitepages/keywords/userlist.php4
3 files changed, 5 insertions, 3 deletions
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;