From 5be2cb4ffad9cd007ff36b048c09c9ee843b4d92 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 3 Nov 2015 11:37:24 +0000 Subject: [PATCH 1/8] MDL-49473 logs: ensure exported logs contain year --- report/log/classes/table_log.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php index 8df6db9285d..324e6b40d15 100644 --- a/report/log/classes/table_log.php +++ b/report/log/classes/table_log.php @@ -112,8 +112,13 @@ class report_log_table_log extends table_sql { * @return string HTML for the time column */ public function col_time($event) { - $recenttimestr = get_string('strftimerecent', 'core_langconfig'); - return userdate($event->timecreated, $recenttimestr); + + if (empty($this->download)) { + $dateformat = get_string('strftimerecent', 'core_langconfig'); + } else { + $dateformat = get_string('strftimedatetimeshort', 'core_langconfig'); + } + return userdate($event->timecreated, $dateformat); } /** From b249fb78b129430f87cd0e6048e56bbf5fb25a8c Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Wed, 4 Nov 2015 00:04:57 +0800 Subject: [PATCH 2/8] Automatically generated installer lang files --- install/lang/ca/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lang/ca/install.php b/install/lang/ca/install.php index fb62037fd3b..df0275c7890 100644 --- a/install/lang/ca/install.php +++ b/install/lang/ca/install.php @@ -90,5 +90,5 @@ $string['welcomep50'] = 'L\'ús de totes les aplicacions d\'aquest paquet és go codi font obert i es distribueix sota llicència GPL.'; $string['welcomep60'] = 'Les pàgines següents us guiaran per una sèrie de passos fàcils de seguir per configurar Moodle en el vostre ordinador. Podeu acceptar els paràmetres per defecte o, opcionalment, modificar-los perquè s\'ajustin a les vostres necessitats.'; -$string['welcomep70'] = 'Feu clic en el botó "Següent" per continuar la configuració de Moodle.'; +$string['welcomep70'] = 'Feu clic al botó «Següent» per continuar amb la configuració de Moodle.'; $string['wwwroot'] = 'Adreça web'; From 8f097731ada315432081e269f8d195dd250aa288 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Fri, 6 Nov 2015 11:56:46 +0000 Subject: [PATCH 3/8] weekly release 2.7.10+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 831cae5b400..86c5163e2cc 100644 --- a/version.php +++ b/version.php @@ -29,11 +29,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2014051210.05; // 20140512 = branching date YYYYMMDD - do not modify! +$version = 2014051210.06; // 20140512 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -$release = '2.7.10+ (Build: 20151031)'; // Human-friendly version name +$release = '2.7.10+ (Build: 20151106)'; // Human-friendly version name $branch = '27'; // This version's branch. $maturity = MATURITY_STABLE; // This version's maturity level. From d01512e36c449f52ddc5e41db567d8f375fc153d Mon Sep 17 00:00:00 2001 From: rajesh Taneja Date: Thu, 5 Nov 2015 10:02:45 +0800 Subject: [PATCH 4/8] MDL-50837 mod_scorm: include locallib to access function --- mod/scorm/lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index 800e47c96ab..43f81ea1569 100644 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -961,6 +961,8 @@ function scorm_pluginfile($course, $cm, $context, $filearea, $args, $forcedownlo // Check SCORM availability. if (!$canmanageactivity) { + require_once($CFG->dirroot.'/mod/scorm/locallib.php'); + $scorm = $DB->get_record('scorm', array('id' => $cm->instance), 'id, timeopen, timeclose', MUST_EXIST); list($available, $warnings) = scorm_get_availability_status($scorm); if (!$available) { From 059c03d494fc8407644adaa5625ba2d86955861e Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 6 Nov 2015 20:51:29 +0100 Subject: [PATCH 5/8] Moodle release 2.7.11 --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index 86c5163e2cc..d22554b11d7 100644 --- a/version.php +++ b/version.php @@ -29,11 +29,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2014051210.06; // 20140512 = branching date YYYYMMDD - do not modify! +$version = 2014051211.00; // 20140512 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -$release = '2.7.10+ (Build: 20151106)'; // Human-friendly version name +$release = '2.7.11 (Build: 20151109)'; // Human-friendly version name $branch = '27'; // This version's branch. $maturity = MATURITY_STABLE; // This version's maturity level. From d503e1badd142e8df366e6f814455ce2972ea53a Mon Sep 17 00:00:00 2001 From: AMOS bot Date: Tue, 10 Nov 2015 00:04:44 +0800 Subject: [PATCH 6/8] Automatically generated installer lang files --- install/lang/ro/error.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install/lang/ro/error.php b/install/lang/ro/error.php index b6a702f823b..8a8e6035303 100644 --- a/install/lang/ro/error.php +++ b/install/lang/ro/error.php @@ -30,6 +30,9 @@ defined('MOODLE_INTERNAL') || die(); +$string['cannotcreatedboninstall'] = '

Nu se poate crea baza de date.

+

Baza de date specificată nu există iar utilizatorul nu are permisiunea de a crea baza de date.

+

Admistratorul site-ului trebuie să verfice configurarea bazei de date.

'; $string['cannotcreatelangdir'] = 'Nu se poate crea un director lang'; $string['cannotcreatetempdir'] = 'Nu se poate crea director temporar'; $string['cannotdownloadcomponents'] = 'Nu se pot descărca componente'; From ab881c73e9f5668a93fba9284f89a21254b13f9a Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 10 Nov 2015 10:49:45 +0100 Subject: [PATCH 7/8] weekly release 2.7.11+ --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index d22554b11d7..e10421c57b2 100644 --- a/version.php +++ b/version.php @@ -29,11 +29,11 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2014051211.00; // 20140512 = branching date YYYYMMDD - do not modify! +$version = 2014051211.01; // 20140512 = branching date YYYYMMDD - do not modify! // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -$release = '2.7.11 (Build: 20151109)'; // Human-friendly version name +$release = '2.7.11+ (Build: 20151110)'; // Human-friendly version name $branch = '27'; // This version's branch. $maturity = MATURITY_STABLE; // This version's maturity level. From 5486cc980c0a96800df21fd32470536087f395f3 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Wed, 18 Nov 2015 15:26:18 +0800 Subject: [PATCH 8/8] MDL-52194 flowplayer: do not check request $_REQUEST variable may contain cookies in some php configurations. See also MDL-48085 --- lib/flowplayer/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/flowplayer/lib.php b/lib/flowplayer/lib.php index fa15b381dda..f9206c46447 100644 --- a/lib/flowplayer/lib.php +++ b/lib/flowplayer/lib.php @@ -36,7 +36,7 @@ function flowplayer_send_flash_content($filename) { // Note: Do not use any fancy APIs here, this must work in all supported versions. // No url params. - if (!empty($_GET) or !empty($_POST) or !empty($_REQUEST)) { + if (!empty($_GET) or !empty($_POST)) { header("HTTP/1.1 404 Not Found"); die; }