#6612 merge conflicts for updating drupal core to 7.94

.editorconfig

@@ -0,0 +1,14 @@
+# Drupal editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -39,23 +39,5 @@ sites/default/files/css/
 
 # files and assets
 sites/default/files
-
-# this library had to have code modified to be compatible with php 7.2
-# and therefore attempting to manage its git repp
-# within the main scratchpads repo raised the question about where
-# to store that modification. give that the modification is
-# related to scratchpads' production server environment,
-# the answer to that question is to store the change in
-# scratchpads' repo. Moreover the original developer may not
-# necessarily want to access a push up to their repo of this
-# backwards compatible change to obsolete php version. 
-# Therefore with that decision to store in Scratchpads, that means
-# disabling the project's own git (i.e. as a submodule), so the files
-# will be removed and not tracked
-sites/all/libraries/vendor/**/.git
-# ^^^ not sure if this works 
-#
-# discussion here:
-# https://stackoverflow.com/questions/22685170/ignore-git-folder-in-sub-folder
-
-
+sites/*/private
+sites/*/files

.htaccess

@@ -6,7 +6,7 @@
 # php_flag opcache.enable Off
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|info|install|make|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig\.save)$">
+<FilesMatch "\.(engine|inc|info|install|make|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -24,12 +24,6 @@ Options +FollowSymLinks
 # Make Drupal handle any 404 errors.
 ErrorDocument 404 /index.php
 
-# Force simple error message for requests for non-existent favicon.ico.
-<Files favicon.ico>
-  # There is no end quote below, for compatibility with Apache 1.3.
-  ErrorDocument 404 "The requested file favicon.ico was not found.
-</Files>
-
 # Set the default handler.
 DirectoryIndex index.php index.html index.htm
 
@@ -46,7 +40,6 @@ DirectoryIndex index.php index.html index.htm
   php_value mbstring.http_input             pass
   php_value mbstring.http_output            pass
   php_flag mbstring.encoding_translation    off
-  php_value memory_limit                    512M
 </IfModule>
 
 # Requires mod_expires to be enabled.