aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-10 20:36:11 -0800
committerfriendica <info@friendica.com>2013-12-10 20:36:11 -0800
commite5ea4a009b81c7f3fa987ba34d20a996055775d6 (patch)
tree3c5a659f1d45ddb4e3d6228ba8161f7133df4873 /mod
parent6e4f9b7ecc42b7196a41c32d1f2a68e4e029ee04 (diff)
downloadvolse-hubzilla-e5ea4a009b81c7f3fa987ba34d20a996055775d6.tar.gz
volse-hubzilla-e5ea4a009b81c7f3fa987ba34d20a996055775d6.tar.bz2
volse-hubzilla-e5ea4a009b81c7f3fa987ba34d20a996055775d6.zip
mod channel is now Comanchified
Diffstat (limited to 'mod')
-rw-r--r--mod/admin.php2
-rw-r--r--mod/channel.php24
2 files changed, 1 insertions, 25 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 2fd762e27..9a6aea35a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -628,7 +628,7 @@ function admin_page_users(&$a){
}
/* get pending */
- $pending = q("SELECT * from account where (account_flags & %d ) ",
+ $pending = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) ",
intval(ACCOUNT_PENDING)
);
diff --git a/mod/channel.php b/mod/channel.php
index 7879f72ee..149936dd7 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -43,30 +43,6 @@ function channel_init(&$a) {
}
-
-function channel_aside(&$a) {
-
-
- if(! $a->profile['profile_uid'])
- return;
-
- $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
- if(! $channel_display)
- profile_create_sidebar($a);
-
- if($channel_display === 'full')
- $a->page['template'] = 'full';
- else {
- $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : '');
- $a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$a->profile['profile_uid'],true));
- $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$cat));
- }
- if(feature_enabled($a->profile['profile_uid'],'tagadelic'))
- $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,$a->profile['channel_hash'],ITEM_WALL));
-
-}
-
-
function channel_content(&$a, $update = 0, $load = false) {
$category = $datequery = $datequery2 = '';