changeset 197:41b24a132af8

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 15 Nov 2013 19:16:12 +0200
parents e65b2392fc0e (diff) ef26d16b836e (current diff)
children 96ab189e5c03
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/register.inc.php	Fri Nov 15 19:15:29 2013 +0200
+++ b/register.inc.php	Fri Nov 15 19:16:12 2013 +0200
@@ -145,7 +145,7 @@
   //" [".hashToAnswer($botCheckHash)."]".
   ")", 20, 20, "botcheck", "autocomplete=\"off\"");
   echo
-  "  <tr><td colspan=\"2\"></td><td>".stGetFormSubmitInput("register", "Register")."</td></tr>\n".
+  "  <tr><td colspan=\"2\"></td><td>".stGetFormSubmitInput("register", "Continue")."</td></tr>\n".
   " </table>\n".
   "</form>\n";
 
--- a/vote.inc.php	Fri Nov 15 19:15:29 2013 +0200
+++ b/vote.inc.php	Fri Nov 15 19:16:12 2013 +0200
@@ -6,7 +6,6 @@
 //
 $sessionType = "user";
 require_once "majax.php";
-$userKeyLen = stGetSetting("userKeyLength");
 
 
 function stGetVoteButton()
@@ -29,6 +28,7 @@
 if (!stUserSessionAuth(FALSE))
 {
   // Perform authentication if we are not in session already
+  $userKeyLen = stGetSetting("userKeyLength");
   echo
     "<h1>Voting system</h1>\n".
     (stGetSessionItem("mode") == "error" ? "<p>ERROR occured, try again</p>." : "").