moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-69050 lang: Fix the variable name in the admin/cli/svgtool.php

Browse source
This commit is contained in:
David Mudrák 2020-09-16 12:00:21 +02:00
parent cde6c9d4a8
commit 7a079a890b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/cli/svgtool.php
View file

@ -38,17 +38,17 @@ if ($unrecognized) {
} }
// If necessary add files that should be ignored - such as in 3rd party plugins. // If necessary add files that should be ignored - such as in 3rd party plugins.
$blacklist = array(); $ignorelist = array();
$path = $options['path']; $path = $options['path'];
if (!file_exists($path)) { if (!file_exists($path)) {
cli_error("Invalid path $path"); cli_error("Invalid path $path");
} }
if ($options['ie9fix']) { if ($options['ie9fix']) {
core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $blacklist); core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $ignorelist);
} else if ($options['noaspectratio']) { } else if ($options['noaspectratio']) {
core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $blacklist); core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $ignorelist);
} else { } else {
$help = $help =
@ -153,9 +153,9 @@ function core_admin_svgtool_noaspectratio($file) {
* @param string $base * @param string $base
* @param string $sub * @param string $sub
* @param string $filecallback * @param string $filecallback
* @param array $blacklist * @param array $ignorelist List of files to be ignored and skipped.
*/ */
function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) { function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
if (is_dir("$base/$sub")) { if (is_dir("$base/$sub")) {
$items = new DirectoryIterator("$base/$sub"); $items = new DirectoryIterator("$base/$sub");
foreach ($items as $item) { foreach ($items as $item) {
@ -163,7 +163,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) {
continue; continue;
} }
$file = $item->getFilename(); $file = $item->getFilename();
core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $blacklist); core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $ignorelist);
} }
unset($item); unset($item);
unset($items); unset($items);
@ -174,7 +174,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) {
return; return;
} }
$file = realpath("$base/$sub"); $file = realpath("$base/$sub");
if (in_array($file, $blacklist)) { if (in_array($file, $ignorelist)) {
return; return;
} }
$filecallback($file); $filecallback($file);