Fixes deletion of first education (Closes #1095).

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 975698d..b0bb393 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -248,13 +248,15 @@ class ProfileSettingEdu implements ProfileSetting
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
         $success = true;
-        if (is_null($value) || !is_array($value)) {
+        if (is_null($value)) {
             $value = array();
             $value = XDB::fetchAllAssoc("SELECT  eduid, degreeid, fieldid, grad_year, program
                                            FROM  profile_education
                                           WHERE  pid = {?} AND !FIND_IN_SET('primary', flags)
                                        ORDER BY  id",
                                         $page->pid());
+        } else if (!is_array($value)) {
+            $value = null;
         } else {
             $i = 0;
             foreach ($value as $key=>&$edu) {

diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 44497f3..87eb54e 100644 (file)
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -176,10 +176,6 @@
     {cycle values="impair, pair" assign=class}
     {include file="profile/general.edu.tpl" eduid=$eduid edu=$edu edu_fields=$edu_fields class=$class}
   {/foreach}
-  {if $edus|@count eq 0}
-    {cycle values="impair, pair" assign=class}
-    {include file="profile/general.edu.tpl" eduid=0 edu=0 class=$class}
-  {/if}
   {cycle values="impair, pair" assign=class}
   {assign var=eduaddid value=$edus|@count}
   <tr id="edu_add" class="edu_{$eduaddid} {$class}">