diff --git a/committees.php b/committees.php index d9045aec..0aeb2bfe 100644 --- a/committees.php +++ b/committees.php @@ -57,7 +57,7 @@ $output=$config['committee_publiclayout']; $name=$r2->firstname.' '.$r2->lastname; - $output=str_replace("name",$u['name'],$output); + $output=str_replace("name",get_value_or_default_boolean($u, 'name', ''),$output); $output=str_replace("title",$r2->title,$output); //make sure we do emailprivate before email so we dont match the wrong thing @@ -73,10 +73,10 @@ } else $output=str_replace("email","",$output); - $output=str_replace("phonehome",$u['phonehome'],$output); - $output=str_replace("phonework",$u['phonework'],$output); - $output=str_replace("phonecell",$u['phonecell'],$output); - $output=str_replace("fax",$u['fax'],$output); + $output=str_replace("phonehome",get_value_or_default_boolean($u, 'phonehome', ''),$output); + $output=str_replace("phonework",get_value_or_default_boolean($u, 'phonework', ''),$output); + $output=str_replace("phonecell",get_value_or_default_boolean($u, 'phonecell', ''),$output); + $output=str_replace("fax",get_value_or_default_boolean($u, 'fax', ''),$output); echo $output; diff --git a/common.inc.php b/common.inc.php index fa1d6cd2..a107cbb4 100644 --- a/common.inc.php +++ b/common.inc.php @@ -395,12 +395,13 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) echo "\n"; ?> - + <? //if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> /css/output.css' /> - +/css/styles.css' /> + - + @@ -431,10 +432,10 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get ?>
-