diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-04-14 19:37:11 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-04-14 19:37:11 +0000 |
| commit | 1c83d517410a013aba23bb44e4620cff7d9e9824 (patch) | |
| tree | a2390c9798675bbc7be2a88e693e1108b93bc527 /modules | |
| parent | fa40f2446091575454de700024aa95aaad058d2c (diff) | |
| download | brdo-1c83d517410a013aba23bb44e4620cff7d9e9824.tar.gz brdo-1c83d517410a013aba23bb44e4620cff7d9e9824.tar.bz2 | |
- Patch by Adrian: postgresql fixes
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/statistics.module | 2 | ||||
| -rw-r--r-- | modules/statistics/statistics.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy.module | 5 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/modules/statistics.module b/modules/statistics.module index 8261758bc..158d9f8fa 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -283,7 +283,7 @@ function statistics_top_users() { array('data' => t('User'), 'field' => 'u.name'), ); - $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid". tablesort_sql($header); + $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid, u.name". tablesort_sql($header); $sql_cnt = "SELECT COUNT(DISTINCT(uid)) FROM {accesslog}"; $result = pager_query($sql, 30, 0, $sql_cnt); diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 8261758bc..158d9f8fa 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -283,7 +283,7 @@ function statistics_top_users() { array('data' => t('User'), 'field' => 'u.name'), ); - $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid". tablesort_sql($header); + $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.uid, u.name". tablesort_sql($header); $sql_cnt = "SELECT COUNT(DISTINCT(uid)) FROM {accesslog}"; $result = pager_query($sql, 30, 0, $sql_cnt); diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 19528d167..355877d6f 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -130,9 +130,8 @@ function taxonomy_form_vocabulary($edit = array()) { } function taxonomy_save_vocabulary($edit) { - if (!$edit['nodes']) { - $edit['nodes'] = array(); - } + $edit['nodes'] = ($edit['nodes']) ? $edit['nodes'] : array(); + $edit['weight'] = ($edit['weight']) ? $edit['weight'] : 0; $data = array('name' => $edit['name'], 'description' => $edit['description'], 'help' => $edit['help'], 'multiple' => $edit['multiple'], 'required' => $edit['required'], 'hierarchy' => $edit['hierarchy'], 'relations' => $edit['relations'], 'tags' => $edit['tags'], 'weight' => $edit['weight'], 'module' => isset($edit['module']) ? $edit['module'] : 'taxonomy'); if ($edit['vid'] && $edit['name']) { diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 19528d167..355877d6f 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -130,9 +130,8 @@ function taxonomy_form_vocabulary($edit = array()) { } function taxonomy_save_vocabulary($edit) { - if (!$edit['nodes']) { - $edit['nodes'] = array(); - } + $edit['nodes'] = ($edit['nodes']) ? $edit['nodes'] : array(); + $edit['weight'] = ($edit['weight']) ? $edit['weight'] : 0; $data = array('name' => $edit['name'], 'description' => $edit['description'], 'help' => $edit['help'], 'multiple' => $edit['multiple'], 'required' => $edit['required'], 'hierarchy' => $edit['hierarchy'], 'relations' => $edit['relations'], 'tags' => $edit['tags'], 'weight' => $edit['weight'], 'module' => isset($edit['module']) ? $edit['module'] : 'taxonomy'); if ($edit['vid'] && $edit['name']) { |