don't show categories widget if there are none

This commit is contained in:
friendica 2012-10-19 03:36:09 -07:00
parent 2c3c933ed4
commit 8981da89c3
4 changed files with 15 additions and 14 deletions

View file

@ -522,6 +522,7 @@ if(! class_exists('App')) {
$this->cmd = 'profile/' . substr($this->cmd,1);
/**
*
* Break the URL path into C style argc/argv style arguments for our

View file

@ -111,20 +111,21 @@ function categories_widget($baseurl,$selected = '') {
intval($a->profile['profile_uid']),
intval(TERM_CATEGORY)
);
if(count($r)) {
if($r && count($r)) {
foreach($r as $rr)
$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
return replace_macros(get_markup_template('categories_widget.tpl'),array(
'$title' => t('Categories'),
'$desc' => '',
'$sel_all' => (($selected == '') ? 'selected' : ''),
'$all' => t('Everything'),
'$terms' => $terms,
'$base' => $baseurl,
));
}
return replace_macros(get_markup_template('categories_widget.tpl'),array(
'$title' => t('Categories'),
'$desc' => '',
'$sel_all' => (($selected == '') ? 'selected' : ''),
'$all' => t('Everything'),
'$terms' => $terms,
'$base' => $baseurl,
));
return '';
}
function common_friends_visitor_widget($profile_uid) {

View file

@ -157,7 +157,6 @@ $a->apps = $arr['app_menu'];
if(strlen($a->module)) {
/**
*
* We will always have a module name.

View file

@ -84,7 +84,7 @@ function install_post(&$a) {
'$dbdata' => $dbdata,
'$timezone' => $timezone,
'$siteurl' => $siteurl,
'$site_id' => hash('whirlpool', random_string()),
'$site_id' => random_string(),
'$phpath' => $phpath,
'$adminmail' => $adminmail
));