Skip to content

Commit b79655c

Browse files
Merge branch 'main' into quizaccess-override
2 parents f510750 + dd17877 commit b79655c

File tree

41 files changed

+3148
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3148
-186
lines changed

.markdownlint/fix-renamed-links.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const {
2828
const path = require('path');
2929
const fs = require('fs');
3030

31-
const rootDir = path.dirname(__dirname);
31+
const rootDir = path.posix.dirname(__dirname);
3232

3333
// A simple regex to capture all links which are not images.
3434
const linkFinder = /(?<!!)(?<description>\[[^\]]*\](?=\((?<target>[^)]*)\)|\[[^\]]*\]))/g;
@@ -67,7 +67,7 @@ const getRenamedFileMapping = (renames) => {
6767
* @param {string} file The file to normalise the location of
6868
* @returns {string} The normalised location
6969
*/
70-
const getNormalisedFile = (file) => `/${path.relative(rootDir, file)}`;
70+
const getNormalisedFile = (file) => `/${path.posix.relative(rootDir, file)}`;
7171

7272
/**
7373
* Get an absolute link relative to the root directory of the project.
@@ -86,10 +86,10 @@ const getNormalisedLink = (file, link) => {
8686
const normalisedFile = getNormalisedFile(file);
8787

8888
// Get the directory that it is in.
89-
const normalisedDir = path.dirname(normalisedFile);
89+
const normalisedDir = path.posix.dirname(normalisedFile);
9090

9191
// Return a link relative to the file that the link was found in.
92-
return path.join(normalisedDir, link);
92+
return path.posix.join(normalisedDir, link);
9393
};
9494

9595
/**
@@ -152,7 +152,7 @@ const findFile = (file) => {
152152
];
153153

154154
for (const filePath of paths) {
155-
const fullPath = path.join(rootDir, filePath);
155+
const fullPath = path.posix.join(rootDir, filePath);
156156
try {
157157
// Allow use of fs.statSync here because it's preferable to asynchronous rule handling for markdownlint.
158158
// eslint-disable-next-line no-restricted-properties
@@ -190,7 +190,7 @@ const getOptimisedLink = (mappings, file, currentLink, forceRelative) => {
190190
// Either the link has changed, or the forceRelative configuration is set.
191191
// Update to point to a relative _file_ if possible.
192192
const updatedFileLink = findFile(updatedLink);
193-
let relativeLink = path.relative(path.dirname(normalisedCurrentFile), updatedFileLink);
193+
let relativeLink = path.posix.relative(path.posix.dirname(normalisedCurrentFile), updatedFileLink);
194194

195195
if (relativeLink.length === 0) {
196196
// This is a link to the current document.

data/libraries.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"copyrightHolders": [],
3535
"location": "admin/tool/mfa/factor/totp/extlib/ParagonIE/ConstantTime",
3636
"name": "Constant-Time Encoding",
37-
"version": "2.1.1",
37+
"version": "3.0.0",
3838
"license": "MIT",
3939
"repository": "https://github.com/paragonie/constant_time_encoding",
4040
"customised": false

data/moodle-contributors.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ Barrett
112112
Barry
113113
Bartel
114114
Basset
115+
Bastian
115116
Bateson
116117
Baudry
117118
Baxter
@@ -793,6 +794,7 @@ Neosi
793794
Netica
794795
Neumann
795796
Newman
797+
Nexterday
796798
Nghia
797799
Nguyen
798800
Nhan
@@ -986,6 +988,7 @@ Scaramuccia
986988
Schach
987989
Schillinger
988990
Schmadel
991+
Schmidt-Kuhl
989992
Schrenk
990993
Schroeder
991994
Schultz
@@ -1323,6 +1326,7 @@ exe-cutor
13231326
fabmen
13241327
fcbsd
13251328
fdallet
1329+
ferran
13261330
ferran.recio
13271331
ferranrecio
13281332
fhuebler
@@ -1355,6 +1359,7 @@ [email protected]
13551359
13561360
inigozendegi
13571361
ishatalkin
1362+
13581363
james-cnz
13591364
jamiepratt
13601365
jamiesensei

data/versions.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
{
3535
"name": "4.5.1",
3636
"releaseDate": "9 December 2024",
37-
"version": 2024100701,
38-
"releaseNoteUrl": false
37+
"version": 2024100701
3938
}
4039
]
4140
},
@@ -76,8 +75,7 @@
7675
{
7776
"name": "4.4.5",
7877
"releaseDate": "9 December 2024",
79-
"version": 2024042205,
80-
"releaseNoteUrl": false
78+
"version": 2024042205
8179
}
8280
]
8381
},
@@ -139,8 +137,7 @@
139137
{
140138
"name": "4.3.9",
141139
"releaseDate": "9 December 2024",
142-
"version": 2023100909,
143-
"releaseNoteUrl": false
140+
"version": 2023100909
144141
}
145142
]
146143
},
@@ -304,8 +301,7 @@
304301
{
305302
"name": "4.1.15",
306303
"releaseDate": "9 December 2024",
307-
"version": 2022112815,
308-
"releaseNoteUrl": false
304+
"version": 2022112815
309305
}
310306
]
311307
},

docs/apis/core/dml/index.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,18 @@ public function get_field_sql(
368368

369369
## Getting field values from multiple records
370370

371+
### get_fieldset
372+
373+
Return values of the given field from a table record as an array where all the given conditions are met.
374+
375+
```php
376+
public function get_fieldset(
377+
string $table,
378+
string $return,
379+
?array $conditions = null
380+
);
381+
```
382+
371383
### get_fieldset_select
372384

373385
Return values of the given field as an array where the given conditions are used in the WHERE clause.

docs/apis/core/hooks/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ If you define a hook which is _not_ in the `[component]\hook\*` namespace then y
126126

127127
namespace mod_example;
128128

129-
class hooks implements \core\hook\hook_discovery_agent {
129+
class hooks implements \core\hook\hook\discovery_agent {
130130
public static function discover_hooks(): array {
131131
return [
132132
[

0 commit comments

Comments
 (0)