Commit 220776ac authored by thepurpleblob's avatar thepurpleblob
Browse files

Merged from STABLE

parent 85ce66b5
...@@ -257,7 +257,7 @@ $CFG->admin = 'admin'; ...@@ -257,7 +257,7 @@ $CFG->admin = 'admin';
// $CFG->apacheloguser = 3; // Log username. // $CFG->apacheloguser = 3; // Log username.
// To get the values logged in Apache's log, add to your httpd.conf // To get the values logged in Apache's log, add to your httpd.conf
// the following statements. In the General part put: // 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: // And in the part specific to your Moodle install / virtualhost:
// CustomLog "/your/path/to/log" moodleformat // CustomLog "/your/path/to/log" moodleformat
// CAUTION: Use of this option will expose usernames in the Apache log, // CAUTION: Use of this option will expose usernames in the Apache log,
......
...@@ -4371,6 +4371,9 @@ function get_string($identifier, $module='', $a=NULL) { ...@@ -4371,6 +4371,9 @@ function get_string($identifier, $module='', $a=NULL) {
$module = 'moodle'; $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 /// Define the two or three major locations of language strings for this module
$locations = array( $CFG->dataroot.'/lang/', $CFG->dirroot.'/lang/' ); $locations = array( $CFG->dataroot.'/lang/', $CFG->dirroot.'/lang/' );
......
<form method="post" action="module.php" name="form"> <form method="post" action="module.php" name="form">
<input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>" />
<table cellpadding=9 cellspacing=0 > <table cellpadding=9 cellspacing=0 >
<tr valign=top> <tr valign=top>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment