Improve the PlView code, adding comments.

[platal.git] / plugins / function.display_education.php

diff --git a/plugins/function.display_education.php b/plugins/function.display_education.php
index da0ea96..160f99c 100644 (file)
--- a/plugins/function.display_education.php
+++ b/plugins/function.display_education.php
@@ -62,7 +62,9 @@ function display_education($name, $url, $degree, $grad_year, $field, $program, $
             $txt .= $name;
         }
     }
-    $txt .= "</span>";
+    if ($grad_year || $field || $program) {
+        $txt .= "</span>";
+    }
 
     return $txt;
 }
@@ -77,8 +79,9 @@ function smarty_function_display_education($params, &$smarty)
     } else {
         $sex = $params->b('sex');
     }
-    return display_education($edu->school_short, $edu->school_url, $edu->degree_short, $edu->grad_year,
-                         $edu->field, $edu->program, $sex, $params->b('long'));
+    return display_education(($edu->school_short == '') ?  $edu->school : $edu->school_short,
+                             $edu->school_url, $edu->degree_short, $edu->grad_year,
+                             $edu->field, $edu->program, $sex, $params->b('long'));
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: