From b6569a95016223aaadbe11c4f8294f9242ab6b43 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sat, 6 Mar 2010 13:59:06 +0100 Subject: [PATCH] Small cleanup. Signed-off-by: Florent Bruneau --- classes/profile.php | 15 +++++++++++++++ templates/include/minifiche.tpl | 12 +++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/classes/profile.php b/classes/profile.php index f8d2781..f83f5f1 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -195,6 +195,21 @@ class Profile return array_unique($vals); } + public function nationalities() + { + $nats = array(); + if ($this->nationality1) { + $nats[] = $this->nationality1; + } + if ($this->nationality2) { + $nats[] = $this->nationality2; + } + if ($this->nationality3) { + $nats[] = $this->nationality3; + } + return $nats; + } + public function __get($name) { if (property_exists($this, $name)) { diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index f6cdc65..cebe1d3 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -60,15 +60,9 @@
- {if $profile->nationality1} - {$profile->nationality1}  - {/if} - {if $profile->nationality2} - {$profile->nationality2}  - {/if} - {if $profile->nationality3} - {$profile->nationality3}  - {/if} + {foreach from=$profile->nationalities() item=nat} + {$nat}  + {/foreach} {$profile->promo()}{* *}{iterate from=$profile->getExtraEducations(4) item=edu}, {education_fmt edu=$edu profile=$profile}{/iterate}{* *}{if $dead}, {"décédé"|sex:"décédée":$profile} le {$profile->deathdate|date_format}{/if} -- 2.1.4