Merge branch 'xorg/maint'

diff --git a/plugins/function.display_education.php b/plugins/function.display_education.php
index 4690f74..143c474 100644 (file)
--- a/plugins/function.display_education.php
+++ b/plugins/function.display_education.php
@@ -32,7 +32,7 @@ function display_education($name, $url, $degree, $gradYear, $field, $program, $f
         }
     }
     if ($url != '') {
-        $txt .= '<a href="' . $url . '" onclick="return popup(this)">' . $name . '</a>';
+        $txt .= '<a href="' . $url . '" target="_blank">' . $name . '</a>';
     } else {
         $txt .= $name;
     }

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 0a321b6..ab40ffd 100644 (file)
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -288,6 +288,19 @@
     </tr>
     {/if}
   </table>
+  {if $contacts|@count eq 0}
+    {* Current Javascript code needs some elements to exist. *}
+    {* TODO: rewrite the code to accept non-existent elements without raising exceptions *}
+    <select id="to_contacts" name="to_contacts[]" multiple="multiple" style="display: none;">
+      <option value="">&nbsp;</option>
+    </select>
+    <select id="cc_contacts" name="cc_contacts[]" multiple="multiple" style="display: none;">
+      <option value="">&nbsp;</option>
+    </select>
+    <select id="contacts" name="all_contacts[]" multiple="multiple" style="display: none;">
+      <option value="">&nbsp;</option>
+    </select>
+  {/if}
   <fieldset>
     <legend>Sujet&nbsp;:&nbsp;<input type='text' name='sujet' size='60' value="{$smarty.request.sujet}" /></legend>
     <div class="center">

diff --git a/templates/include/jobterms.branch.tpl b/templates/include/jobterms.branch.tpl
index 0d23b90..6bcd8b5 100644 (file)
--- a/templates/include/jobterms.branch.tpl
+++ b/templates/include/jobterms.branch.tpl
@@ -29,7 +29,7 @@
     {ldelim}
       "title" : "{$term.name|replace:'"':'\\"'}{if t($filter)} ({$term.nb} {$filter}{if $term.nb > 1}s{/if}){/if}",
       "attr" : {ldelim}
-        {if !$jtid}"href" : "javascript:return false;",
+        {if !$jtid}"href" : "javascript:void(0)",
         {elseif $attrfunc}"href" : "javascript:{$attrfunc}('{$treeid}','{$term.jtid}',\"{$term.full_name|replace:'"':'\\\\\\"'}\")",{/if}
         "title" : "{$term.full_name|replace:'"':'\\"'}"
       {rdelim}