From c4784f82a603537ba862df24ee4407be3e20d538 Mon Sep 17 00:00:00 2001
From: Eric Rasmussen <eric@unl.edu>
Date: Mon, 30 Jan 2012 00:20:23 +0000
Subject: [PATCH] [gh-278] Merging test into staging -c1417
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1418 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/unl_site_creation.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sites/all/modules/unl/unl_site_creation.php b/sites/all/modules/unl/unl_site_creation.php
index 477f1ea3..9761d636 100644
--- a/sites/all/modules/unl/unl_site_creation.php
+++ b/sites/all/modules/unl/unl_site_creation.php
@@ -175,8 +175,11 @@ function unl_site_list($form, &$form_state) {
// Generate an array of Last Access timestamps for each site based on time last accessed by someone in a non-admin role
foreach ($sites as $site) {
- if (db_table_exists($site->db_prefix.'_'.$master_prefix.'users') && db_table_exists($site->db_prefix.'_'.$master_prefix.'users_roles')) {
- $last_access[$site->site_id] = db_query('SELECT u.access FROM '.$site->db_prefix.'_'.$master_prefix.'users u, '.$site->db_prefix.'_'.$master_prefix.'users_roles r WHERE u.uid = r.uid AND u.access > 0 AND r.rid IN ('.$roles_in.') ORDER BY u.access DESC')->fetchColumn();
+ if (db_table_exists($site->db_prefix.'_'.$master_prefix.'users') &&
+ db_table_exists($site->db_prefix.'_'.$master_prefix.'users_roles') &&
+ !empty($roles_in)) {
+ $query = 'SELECT u.access FROM '.$site->db_prefix.'_'.$master_prefix.'users u, '.$site->db_prefix.'_'.$master_prefix.'users_roles r WHERE u.uid = r.uid AND u.access > 0 AND r.rid IN ('.$roles_in.') ORDER BY u.access DESC';
+ $last_access[$site->site_id] = db_query($query)->fetchColumn();
}
}
--
GitLab