moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-36126_master' of https://github.com/markn86/moodle

Browse source
This commit is contained in:
Dan Poltawski 2013-08-26 14:25:20 +08:00
commit ba59a28305
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backup/util/loggers/database_logger.class.php
View file

@ -59,7 +59,7 @@ class database_logger extends base_logger {
if ($this->levelcol) { if ($this->levelcol) {
$columns[$this->levelcol] = $level; $columns[$this->levelcol] = $level;
} }
$columns[$this->messagecol] = $message; //TODO: should this be cleaned? $columns[$this->messagecol] = clean_param($message, PARAM_NOTAGS);
return $this->insert_log_record($this->logtable, $columns); return $this->insert_log_record($this->logtable, $columns);
} }
@ -69,6 +69,6 @@ class database_logger extends base_logger {
// to preserve DB logs if the whole backup/restore transaction is // to preserve DB logs if the whole backup/restore transaction is
// rollback // rollback
global $DB; global $DB;
return $DB->insert_record($this->logtable, $columns, false); // Don't return inserted id return $DB->insert_record($table, $columns, false); // Don't return inserted id
} }
} }

2
lib/db/install.xml
View file

@ -2750,7 +2750,7 @@
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/> <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="backupid" TYPE="char" LENGTH="32" NOTNULL="true" SEQUENCE="false" COMMENT="backupid the log record belongs to"/> <FIELD NAME="backupid" TYPE="char" LENGTH="32" NOTNULL="true" SEQUENCE="false" COMMENT="backupid the log record belongs to"/>
<FIELD NAME="loglevel" TYPE="int" LENGTH="4" NOTNULL="true" SEQUENCE="false" COMMENT="level of the log (debug...error)"/> <FIELD NAME="loglevel" TYPE="int" LENGTH="4" NOTNULL="true" SEQUENCE="false" COMMENT="level of the log (debug...error)"/>
<FIELD NAME="message" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" COMMENT="text logged"/> <FIELD NAME="message" TYPE="text" NOTNULL="true" SEQUENCE="false" COMMENT="text logged"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="timestamp this log entry was created"/> <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" COMMENT="timestamp this log entry was created"/>
</FIELDS> </FIELDS>
<KEYS> <KEYS>

12
lib/db/upgrade.php
View file

@ -2327,5 +2327,17 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013081200.00); upgrade_main_savepoint(true, 2013081200.00);
} }
if ($oldversion < 2013082300.01) {
// Define the table 'backup_logs' and the field 'message' which we will be changing from a char to a text field.
$table = new xmldb_table('backup_logs');
$field = new xmldb_field('message', XMLDB_TYPE_TEXT, null, null, XMLDB_NOTNULL, null, null, 'loglevel');
// Perform the change.
$dbman->change_field_type($table, $field);
// Main savepoint reached.
upgrade_main_savepoint(true, 2013082300.01);
}
return true; return true;
} }

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2013082300.00; // YYYYMMDD = weekly release date of this DEV branch. $version = 2013082300.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.