diff options
| author | friendica <info@friendica.com> | 2013-11-21 17:23:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-21 17:23:14 -0800 |
| commit | 3e0ac769aad2ae15934c32eef2f4992bde73e178 (patch) | |
| tree | 1b08f1cc0a06962e10896e1a71ea504ecaddefa2 /include | |
| parent | be8a7e2de6326ea9fb16bebbafeaeaf6fa52a767 (diff) | |
| download | volse-hubzilla-3e0ac769aad2ae15934c32eef2f4992bde73e178.tar.gz volse-hubzilla-3e0ac769aad2ae15934c32eef2f4992bde73e178.tar.bz2 volse-hubzilla-3e0ac769aad2ae15934c32eef2f4992bde73e178.zip | |
white screen
Diffstat (limited to 'include')
| -rw-r--r-- | include/group.php | 6 | ||||
| -rw-r--r-- | include/zot.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php index eece07983..d339301b4 100644 --- a/include/group.php +++ b/include/group.php @@ -202,7 +202,7 @@ function group_get_members($gid) { return $ret; } -function mini_group_select($uid,$gid = 0) { +function mini_group_select($uid,$group = '') { $grps = array(); $o = ''; @@ -210,10 +210,10 @@ function mini_group_select($uid,$gid = 0) { $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", intval($uid) ); - $grps[] = array('name' => '', 'id' => '0', 'selected' => ''); + $grps[] = array('name' => '', 'hash' => '0', 'selected' => ''); if(count($r)) { foreach($r as $rr) { - $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : '')); + $grps[] = array('name' => $rr['name'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : '')); } } diff --git a/include/zot.php b/include/zot.php index 9906b7ec8..65f3b606f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -626,7 +626,7 @@ function import_xchan($arr,$ud_flags = 1) { } // Remove pure duplicates - if($count($r) > 1) { + if(count($r) > 1) { for($h = 1; $h < count($r); $h ++) { q("delete from hubloc where hubloc_id = %d limit 1", intval($r[$h]['hubloc_id']) |