diff --git a/docs/upgrades/upgrade_5.5.0-5.5.1.sql b/docs/upgrades/upgrade_5.5.0-5.5.1.sql
index 2687bcfbc..ef7d715e3 100644
--- a/docs/upgrades/upgrade_5.5.0-5.5.1.sql
+++ b/docs/upgrades/upgrade_5.5.0-5.5.1.sql
@@ -4,4 +4,5 @@ DELETE FROM international WHERE internationalId=71 and namespace='USS' and langu
INSERT INTO international VALUES (71,'USS',1,'User Submission Systems are a great way to add a sense of community to any site as well as get free content from your users.\r\n
\r\n\r\nMain Template
\r\nChoose a layout for this USS.\r\n
\r\n\r\nSubmission Template
\r\nChoose a layout for the individual submissions.\r\n
\r\n\r\nSort Order
\r\nThe direction to sort the submission list by.\r\n
\r\n\r\nDefault Status
\r\nShould submissions be set to Approved, Pending, or Denied by default?\r\n
\r\nNote: If you set the default status to Pending, then be prepared to monitor your message log for new submissions.\r\n
\r\n\r\nKarma Per Submission
\r\nHow much karma should be given to a user when they contribute to this user submission system?\r\n
\r\n\r\n\r\nAllow discussion?
\r\nChecking this box will enable responses to your article much like Articles on Slashdot.org.\r\n
\r\n\r\n\r\n',1066637303,NULL); DELETE FROM international WHERE internationalId=1055 and namespace='WebGUI' and languageId = 1; INSERT INTO international VALUES (1055,'WebGUI',1,'WebGUI has a very powerful built-in discussion system. It can be attached to anything and is attached to many wobjects.\r\n
\r\nForums (aka Discussions) have many settable properties. The following is a comprehensive list:\r\n
\r\n\r\nForum Template
\r\nA template that controls the layout of the forum view.\r\n
\r\n\r\nThread Template
\r\nA template that controls the layout of the thread view.\r\n
\r\n\r\nPost Template
\r\nA template that controls the layout of the post view.\r\n
\r\n\r\nSearch Template
\r\nA template that controls the layout of the search engine interface and search results.\r\n
\r\n\r\nPost Form Template
\r\nA template that controls the form that users see when posting a new message.\r\n
\r\n\r\nNotification Template
\r\nA template that controls the layout of subscription notification messages sent to users.\r\n
\r\n\r\nArchive After
\r\nIf a thread hasn\'t had a new message after this interval has expired then it will be flagged as \"archived\" and will only be accessible via the search engine.\r\n
\r\n\r\nEdit Timeout
\r\nThe interval of time that the user has to edit their message after their inital post.\r\n
\r\nNOTE: Don\'t set this limit too high. One of the great things about discussions is that they are an accurate record of who said what. If you allow editing for a long time, then a user has a chance to go back and change his/her mind a long time after the original statement was made.\r\n
\r\n\r\nAdd edit stamp to posts?
\r\nIf set to yes then a string will be added to the bottom of a post each time its edited.\r\n
\r\n\r\nAllow rich edit?
\r\nIf set to yes then users will be able to use a rich editor when writing their posts.\r\n
\r\n\r\nAllow replacements?
\r\nIf set to yes then users will be able to use replacements in thier posts. Replacements can be managed from the settings.\r\n
\r\n\r\nFilter Post
\r\nSelect what types of content you will filter from a user\'s post.\r\n
\r\n\r\nPosts Per Page
\r\nThe number of posts to display on a single page.\r\n
\r\n\r\nKarma Per Post
\r\nHow much karma should be given to a user when they post a message?\r\n
\r\n\r\nWho can post?
\r\nA group that is allowed to post new messages.\r\n
\r\n\r\nModerate posts?
\r\nIf set to yes then posts will be set to pending by default and will not be displayed until a moderator approves the message.\r\n
\r\n\r\nWho can moderate?
\r\nA group that is allowed to moderate messages.\r\n
\r\n',1068708617,NULL); +INSERT INTO international VALUES (82,'Survey',1,'Terminate Survey',1068901816,''); diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm index 0469976bc..2e9d5b6ff 100644 --- a/lib/WebGUI/Wobject/Survey.pm +++ b/lib/WebGUI/Wobject/Survey.pm @@ -331,6 +331,7 @@ sub www_editAnswer { if ($_[0]->get("questionOrder") eq "response") { $question = WebGUI::SQL->buildHashRef("select Survey_questionId,question from Survey_question where Survey_id=".$_[0]->get("Survey_id")." order by sequenceNumber"); + $question = { ('-1' => WebGUI::International::get(82,$_[0]->get("namespace")),%$question) }; $f->select( -name=>"gotoQuestion", -options=>$question, @@ -621,6 +622,7 @@ sub www_view { } else { $questionOrder = "sequential"; } + undef $question if ($responseDriver < 0); # Terminate Survey } if ($questionOrder eq "sequential" && $previousResponse->{Survey_questionId}) { my $previousQuestion = $_[0]->getCollateral("Survey_question","Survey_questionId",