diff --git a/adminstuds.php b/adminstuds.php
index af2cbaf..9904f78 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -742,8 +742,8 @@ echo '
-
-
+
+
diff --git a/choix_autre.php b/choix_autre.php
index 66e8498..f854120 100644
--- a/choix_autre.php
+++ b/choix_autre.php
@@ -119,7 +119,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
} else { // text only
- $li_subject_text = stripslashes($toutsujet[$i]);
+ $li_subject_text = stripslashes($_SESSION['choices'][$i]);
$li_subject_html = $li_subject_text;
}
@@ -188,7 +188,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
-
+
'."\n";
}
diff --git a/js/core.js b/js/core.js
index 0472981..5a01e8f 100644
--- a/js/core.js
+++ b/js/core.js
@@ -284,6 +284,7 @@ $(document).ready(function() {
$(document).on('click', '.md-a-img', function() {
$('#md-a-imgModal').modal('show');
$('#md-a-imgModal .btn-primary').attr('value',$(this).prev().attr('id'));
+ $('#md-a-imgModalLabel').text($(this).attr('title'));
});
$('#md-a-imgModal .btn-primary').on('click', function() {
if($('#md-img').val()!='' && $('#md-a').val()!='') {
@@ -297,6 +298,7 @@ $(document).ready(function() {
}
$('#md-a-imgModal').modal('hide');
$('#md-img').val(''); $('#md-a').val('');$('#md-text').val('');
+ SubmitChoicesAvalaible();
});
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo
index 680e114..b7274c3 100644
Binary files a/locale/fr_FR/LC_MESSAGES/Studs.mo and b/locale/fr_FR/LC_MESSAGES/Studs.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po
index 234a3bc..c7eb8de 100644
--- a/locale/fr_FR/LC_MESSAGES/Studs.po
+++ b/locale/fr_FR/LC_MESSAGES/Studs.po
@@ -196,10 +196,10 @@ msgstr "Adresse email"
msgid "Edit the email adress"
msgstr "Modifier l'adresse email"
-msgid "Save the adress email"
+msgid "Save the email address "
msgstr "Enregistrer l'adresse email"
-msgid "Cancel the adress email edit"
+msgid "Cancel the email address edit"
msgstr "Annuler le changement d'adresse email"
msgid "Edit the description"
diff --git a/studs.php b/studs.php
index f4aa4da..c1d3459 100644
--- a/studs.php
+++ b/studs.php
@@ -47,13 +47,21 @@ if(Utils::issetAndNoEmpty('sondage') === true) {
$numsondage = $_SESSION["numsondage"];
}
-if ($numsondage !== false) {
- $dsondage = Utils::get_sondage_from_id($numsondage);
- if($dsondage === false) {
- $err |= NO_POLL;
- }
-} else {
- $err |= NO_POLL_ID;
+$dsondage = ($numsondage != false) ? Utils::get_sondage_from_id($numsondage) : false;
+if (!$dsondage || $dsondage->id_sondage == ''){
+ Utils::print_header( _("Error!"));
+
+ bandeau_titre(_("Error!"));
+
+ echo '
+ '."\n";
+
+ bandeau_pied();
+
+ die();
}
//output a CSV and die()
@@ -199,17 +207,6 @@ if($err != 0) {
echo '';
- if(Utils::is_error(NO_POLL_ID) || Utils::is_error(NO_POLL)) {
- echo '
- '."\n";
-
- bandeau_pied();
-
- die();
- }
} else {
Utils::print_header(_('Poll').' - '.$dsondage->titre);
bandeau_titre(_("Make your polls"));