Skip to content

D
dar-otechestvu
Commit 5ec7b510 authored by Sergey Shadrin's avatar Sergey Shadrin
Browse files
Options

[#124455] Added patch to replace core icons

parent 067e2e31
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 38 deletions
composer.json
View file @ 5ec7b510
...@@ -145,7 +145,8 @@ ...@@ -145,7 +145,8 @@
"patches": { "patches": {
"drupal/core": { "drupal/core": {
"Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch", "Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch",
"Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated" : "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch" "Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated" : "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
"Replace icons": "./patches/drupal_core/core-icons.patch"
} }
} }
} }
......
docroot/core/PATCHES.txt
View file @ 5ec7b510
...@@ -9,3 +9,7 @@ Querying with NULL values results in warning mb_strtolower(): Passing null to pa ...@@ -9,3 +9,7 @@ Querying with NULL values results in warning mb_strtolower(): Passing null to pa
Source: https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch Source: https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch
Replace icons
Source: ./patches/drupal_core/core-icons.patch
docroot/core/misc/druplicon.png
View replaced file @ 067e2e31 View file @ 5ec7b510
docroot/core/misc/druplicon.png

3.81 KB | W: | H:

docroot/core/misc/druplicon.png

13 KB | W: | H:

docroot/core/misc/druplicon.png
docroot/core/misc/druplicon.png
docroot/core/misc/druplicon.png
docroot/core/misc/druplicon.png
  • 2-up
  • Swipe
  • Onion skin
docroot/core/misc/favicon.ico
View replaced file @ 067e2e31 View file @ 5ec7b510
docroot/core/misc/favicon.ico

5.3 KB | W: | H:

docroot/core/misc/favicon.ico

9.44 KB | W: | H:

docroot/core/misc/favicon.ico
docroot/core/misc/favicon.ico
docroot/core/misc/favicon.ico
docroot/core/misc/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
docroot/core/themes/claro/logo.svg
View file @ 5ec7b510
<svg xmlns="http://www.w3.org/2000/svg" width="57" height="66" viewBox="471.5 467 57 66" enable-background="new 471.5 467 57 66"><path opacity=".2" fill="#303030" d="M528.5 504.965c0 16.634-13.123 27.615-28.24 27.615-10.29 0-19.894-5.523-24.978-14.167l.605-.027c1.313 1.192 3.39 2.58 7.404 2.515 4.77-.064 5.645-.875 9.855-2.756 22.716-10.17 26.925-19.457 27.736-21.59s2.013-5.587.756-9.415c-.242-.737-.42-1.333-.54-1.808-3.018-3.372-6.017-5.225-6.92-5.784-.14-.093-.29-.177-.43-.26l.44.26c2.01 1.247 14.314 8.782 14.314 25.417z"/><path fill="#fff" d="M509.09 518.507c1.006 0 2.077.065 2.83.568.756.503 1.193 1.63 1.445 2.263.25.634 0 1.006-.503 1.258-.438.25-.503.12-.94-.69-.44-.81-.82-1.63-3.01-1.63s-2.887.755-3.948 1.63c-1.062.876-1.443 1.193-1.825.69s-.253-1.006.437-1.63 1.825-1.63 2.888-2.077c1.06-.45 1.62-.383 2.625-.383zm-10.413 7.152c1.257 1.005 3.14 1.825 7.153 1.825 4.015 0 6.836-1.137 8.094-2.077.568-.438.82-.065.875.187.056.25.186.624-.252 1.07-.316.317-3.194 2.33-6.594 2.636-3.4.31-7.964.504-10.73-2.01-.438-.44-.316-1.07 0-1.323.317-.25.568-.438.94-.438.374.008.317.008.513.13z"/><path opacity=".2" fill="#aaa" d="M520.89 496.545c-.81 2.133-5.02 11.42-27.735 21.59-4.21 1.88-5.085 2.69-9.854 2.756-4.013.066-6.09-1.32-7.403-2.514l-.605.028h-.01c-2.393-4.042-3.78-8.783-3.78-13.952 0-7.852 2.97-13.654 6.287-17.687.11-.13.213-.26.325-.382 2.683-3.148 5.55-5.17 7.218-6.203.038-.028.075-.047.112-.065.42-.25.754-.447.987-.568 2.757-1.51 4.77-2.263 7.963-4.77.12-.092.242-.186.354-.288l.008-.01c.875-.754 1.64-1.76 2.18-3.4v-.008c.325-.97.567-2.16.716-3.65l.02.018c2.253 2.69 4.954 5.886 6.89 7.144.69.447 1.38.848 2.068 1.202l.3.15c2.243 1.126 4.507 1.945 6.807 3.333l.428.26c.903.56 3.902 2.412 6.92 5.784.12.475.298 1.07.54 1.807 1.274 3.837.073 7.292-.737 9.425z"/><path opacity=".5" fill="#333" d="M514.176 479.538c-3.26-2.077-6.464-2.887-9.603-4.955-1.938-1.267-4.64-4.47-6.893-7.162-.438 4.332-1.686 6.148-3.26 7.35-3.195 2.515-5.207 3.26-7.963 4.77-2.338 1.256-14.958 8.726-14.958 24.913 0 5.17 1.387 9.91 3.77 13.96 5.077 8.635 14.68 14.158 24.97 14.158 15.126 0 28.24-10.98 28.24-27.614 0-9.127-3.707-15.526-7.386-19.633-3.016-3.382-6.015-5.217-6.918-5.785zm7.627 7.34c4.117 5.15 6.213 11.23 6.213 18.077 0 3.968-.755 7.712-2.245 11.148-1.414 3.25-3.444 6.13-6.053 8.56-5.15 4.806-12.062 7.45-19.475 7.45-3.67 0-7.265-.698-10.692-2.086-3.372-1.36-6.398-3.297-9.016-5.774-5.532-5.225-8.57-12.257-8.57-19.8 0-6.716 2.18-12.695 6.483-17.753 3.288-3.865 6.836-6.007 8.196-6.743.67-.363 1.285-.69 1.89-.997 1.892-.97 3.68-1.89 6.14-3.818 1.312-.997 2.71-2.58 3.305-6.585 2.077 2.468 4.48 5.234 6.314 6.426 1.63 1.08 3.307 1.835 4.918 2.562 1.527.69 3.11 1.406 4.676 2.403l.056.037c4.62 2.84 7.06 5.896 7.86 6.892z"/><path opacity=".5" fill="#fff" d="M497.98 468.678c.874 2.58.753 3.893.753 4.452 0 .56-.307 2.077-1.313 2.832-.438.317-.568.568-.568.624 0 .25.568.438.568 1.006 0 .69-.317 2.077-3.642 5.393-3.325 3.316-8.103 6.278-11.8 8.103-3.698 1.826-5.468 1.686-5.97.81s.185-2.83 2.514-5.392l9.667-6.278 9.164-6.398.503-2.44"/><path fill="#fff" d="M497.98 468.613c-.57 4.145-1.826 5.393-3.512 6.715-2.83 2.133-5.588 3.446-6.212 3.763-1.63.82-7.535 4.08-10.608 8.784-.94 1.444 0 2.012.186 2.133.187.12 2.33.372 6.9-2.385 4.574-2.757 6.595-4.387 9.175-7.078 1.377-1.444 1.573-2.263 1.573-2.636 0-.438-.316-.624-.82-.754-.25-.065-.316-.187 0-.373.317-.186 1.622-.82 1.938-1.07.318-.25 1.827-1.257 1.882-2.887.065-1.63-.056-2.766-.503-4.21zm-14.112 45.628c.065-4.898 4.648-9.472 10.422-9.536 7.348-.065 12.424 7.283 16.13 7.208 3.14-.064 9.166-6.212 12.118-6.212 3.14 0 4.014 3.26 4.014 5.206 0 1.938-.623 5.458-2.133 7.656-1.51 2.198-2.44 3.008-4.2 2.888-2.264-.187-6.78-7.21-9.67-7.35-3.64-.12-11.547 7.6-17.75 7.6-3.763 0-4.9-.567-6.147-1.378-1.92-1.312-2.85-3.315-2.785-6.08z"/></svg> <svg width="214" height="214" viewBox="0 0 214 214" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M172 59C154.963 36 135 19 105 0C110.5 30.5 58.5 50 41 68.5C23.5 87 17 106.188 17 125.902C17 174.204 57.6985 213.5 106 213.5C154.302 213.5 196.5 174.204 196.5 125.902C196.5 106.188 189.037 82 172 59Z" fill="#008CF2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M105.318 83.5C92.4745 83.5 81.0102 88.6894 73.0589 96.8593C70.2775 99.7171 68.2075 104.354 67.3793 109.481C66.5258 114.766 67.2414 118.928 68.2111 120.763C58 122 51.5 113 52.5 104.5C53.2059 98.5 55.8754 91.5746 61.5929 85.7C72.5277 74.4646 88.115 67.5 105.318 67.5C137.872 67.5 165 92.6234 165 124.5C165 156.377 137.872 181.5 105.318 181.5C100.829 181.5 93.7529 180.358 90 180C85.3088 179.654 71.5 179 64 182L83.5 108.5C85.5 102 91.7553 98.2637 102.602 99.6635L84.5586 164.168C86.3276 164.183 88.0427 164.274 89.7083 164.397C91.628 164.538 93.3802 164.707 95.0667 164.87C98.4724 165.198 101.61 165.5 105.318 165.5C129.85 165.5 149 146.747 149 124.5C149 102.253 129.85 83.5 105.318 83.5Z" fill="white"/>
</svg>
vendor/autoload.php
View file @ 5ec7b510
...@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { ...@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339::getLoader(); return ComposerAutoloaderInita036fdc36fb96a0b8cd814e5fcb4ba3e::getLoader();
vendor/composer/autoload_real.php
View file @ 5ec7b510
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339 class ComposerAutoloaderInita036fdc36fb96a0b8cd814e5fcb4ba3e
{ {
private static $loader; private static $loader;
...@@ -24,20 +24,20 @@ class ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339 ...@@ -24,20 +24,20 @@ class ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339
require __DIR__ . '/platform_check.php'; require __DIR__ . '/platform_check.php';
spl_autoload_register(array('ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInita036fdc36fb96a0b8cd814e5fcb4ba3e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitf0f582019f07c0277b8f10a3454e8339', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInita036fdc36fb96a0b8cd814e5fcb4ba3e', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php'; $includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path(); $includePaths[] = get_include_path();
set_include_path(implode(PATH_SEPARATOR, $includePaths)); set_include_path(implode(PATH_SEPARATOR, $includePaths));
require __DIR__ . '/autoload_static.php'; require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::getInitializer($loader));
$loader->register(true); $loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::$files; $filesToLoad = \Composer\Autoload\ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) { $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
......
vendor/composer/autoload_static.php
View file @ 5ec7b510
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInitf0f582019f07c0277b8f10a3454e8339 class ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e
{ {
public static $files = array ( public static $files = array (
'6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php', '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
...@@ -563,10 +563,10 @@ class ComposerStaticInitf0f582019f07c0277b8f10a3454e8339 ...@@ -563,10 +563,10 @@ class ComposerStaticInitf0f582019f07c0277b8f10a3454e8339
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::$prefixesPsr0; $loader->prefixesPsr0 = ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::$prefixesPsr0;
$loader->classMap = ComposerStaticInitf0f582019f07c0277b8f10a3454e8339::$classMap; $loader->classMap = ComposerStaticInita036fdc36fb96a0b8cd814e5fcb4ba3e::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }
......
vendor/composer/installed.json
View file @ 5ec7b510
...@@ -2587,7 +2587,8 @@ ...@@ -2587,7 +2587,8 @@
}, },
"patches_applied": { "patches_applied": {
"Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch", "Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch",
"Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated": "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch" "Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated": "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
"Replace icons": "./patches/drupal_core/core-icons.patch"
} }
}, },
"installation-source": "dist", "installation-source": "dist",
......
vendor/pear/archive_tar/tests/dirtraversal.phpt
View file @ 5ec7b510
--TEST-- --TEST--
test directory traversal security vulnerability test directory traversal security vulnerability
--SKIPIF-- --SKIPIF--
--FILE-- --FILE--
<?php <?php
require_once dirname(__FILE__) . '/setup.php.inc'; require_once dirname(__FILE__) . '/setup.php.inc';
$me = dirname(__FILE__) . '/testit'; $me = dirname(__FILE__) . '/testit';
$tar = new Archive_Tar(dirname(__FILE__) . '/hamidTARtester2.tar'); $tar = new Archive_Tar(dirname(__FILE__) . '/hamidTARtester2.tar');
$tar->listContent(); $tar->listContent();
$phpunit->assertErrors(array( $phpunit->assertErrors(array(
array('package' => 'PEAR_Error', 'message' => 'Malicious .tar detected, file "/../../../../../../../../../../../../../../AAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB.txt" will not install in desired directory tree') array('package' => 'PEAR_Error', 'message' => 'Malicious .tar detected, file "/../../../../../../../../../../../../../../AAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB.txt" will not install in desired directory tree')
), 'after 1'); ), 'after 1');
$tar->extract(); $tar->extract();
$phpunit->assertErrors(array( $phpunit->assertErrors(array(
array('package' => 'PEAR_Error', 'message' => 'Malicious .tar detected, file "/../../../../../../../../../../../../../../AAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB.txt" will not install in desired directory tree') array('package' => 'PEAR_Error', 'message' => 'Malicious .tar detected, file "/../../../../../../../../../../../../../../AAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB.txt" will not install in desired directory tree')
), 'after 2'); ), 'after 2');
echo 'tests done'; echo 'tests done';
?> ?>
--CLEAN-- --CLEAN--
<?php <?php
@rmdir('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa'); @rmdir('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa');
?> ?>
--EXPECT-- --EXPECT--
tests done tests done
Markdown is supported
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