Merged from STABLE

config-dist.php

@@ -257,7 +257,7 @@ $CFG->admin = 'admin';
 //     $CFG->apacheloguser = 3; // Log username. 
 // To get the values logged in Apache's log, add to your httpd.conf
 // the following statements. In the General part put:
-//     LogFormat "%h %l %{MOODLEUSER}n %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" moodleformat
+//     LogFormat "%h %l %{MOODLEUSER}n %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\"" moodleformat
 // And in the part specific to your Moodle install / virtualhost:
 //     CustomLog "/your/path/to/log" moodleformat
 // CAUTION: Use of this option will expose usernames in the Apache log,

lib/moodlelib.php

@@ -4371,6 +4371,9 @@ function get_string($identifier, $module='', $a=NULL) {
         $module = 'moodle';
     }
 
+    // if $a happens to have % in it, double it so sprintf() doesn't break
+    $a = str_replace( '%','%%',$a );
+
 /// Define the two or three major locations of language strings for this module
 
     $locations = array( $CFG->dataroot.'/lang/',  $CFG->dirroot.'/lang/' );

mod/assignment/config.html

 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>