From 1a1cff57b05d31fbbb8be17262b283a82727f988 Mon Sep 17 00:00:00 2001
From: Administrator <benoit.lemay@griffmedia..com>
Date: Thu, 21 Nov 2019 12:09:51 -0500
Subject: [PATCH 001/123] missing-entities

---
 .../ExpressionEngine/Config/foreign_chars.php | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php b/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
index 8a4f88baf7..8a6e7e946f 100644
--- a/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
+++ b/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
@@ -1,4 +1,4 @@
-<?php
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /*
 | -------------------------------------------------------------------
 | Foreign Characters
@@ -8,9 +8,14 @@
 |
 */
 
-// $foreign_chars =
-return array(
+// $foreign_chars = 
+return array(	
 	'223'	=>	"ss", // ß
+	'192'	=>  "a", // À
+	'193'	=>  "a", // Á
+	'194'	=>  "a", // Â
+	'195'	=>  "a", // Ã
+	'196'	=>  "a", // Ä
 	'224'	=>  "a",
 	'225'	=>  "a",
 	'226'	=>	"a",
@@ -18,22 +23,39 @@
 	'227'	=>	"ae", // ã
 	'228'	=>	"ae", // ä
 	'230'	=>	"ae", // æ
+	'199'	=>	"c", // Ç
 	'231'	=>	"c",
+	'200'	=>	"e",  // È
+	'201'	=>	"e",  // É
+	'202'	=>	"e",  // Ê
+	'203'	=>	"e",  // Ë
 	'232'	=>	"e",  // è
 	'233'	=>	"e",  // é
 	'234'	=>	"e",  // ê
 	'235'	=>	"e",  // ë
+	'204'	=>  "i",  // Ì
+	'205'	=>  "i",  // Í
+	'206'	=>  "i",  // Î
+	'207'	=>  "i",  // Ï
 	'236'	=>  "i",
 	'237' 	=>  "i",
 	'238' 	=>	"i",
 	'239' 	=>	"i",
 	'241'	=>	"n",
 	'242'	=>  "o",
+	'210'	=>  "o", // Ò
+	'211'	=>  "o", // Ó
+	'212'	=>  "o", // Ô
+	'213'	=>  "o", // Õ
 	'243'	=>  "o",
 	'244' 	=>	"o",
 	'245'	=>	"o",
 	'246'	=>	"oe", // ö
 	'249'	=>  "u",
+	'217'	=>  "u", // Ù
+	'218' 	=>  "u", // Ú
+	'219' 	=>  "u", // Û
+	'220' 	=>  "u", // Ü
 	'250' 	=>  "u",
 	'251' 	=>	"u",
 	'252'	=>	"ue", // ü

From 582b04d9a9d24a2585be012ff63306fae2533cce Mon Sep 17 00:00:00 2001
From: Administrator <benoit.lemay@griffmedia..com>
Date: Thu, 21 Nov 2019 12:27:09 -0500
Subject: [PATCH 002/123] Add missing entities

---
 .../ee/EllisLab/ExpressionEngine/Config/foreign_chars.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php b/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
index 8a6e7e946f..53ac5ba5e2 100644
--- a/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
+++ b/system/ee/EllisLab/ExpressionEngine/Config/foreign_chars.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 /*
 | -------------------------------------------------------------------
 | Foreign Characters
@@ -8,8 +8,8 @@
 |
 */
 
-// $foreign_chars = 
-return array(	
+// $foreign_chars =
+return array(
 	'223'	=>	"ss", // ß
 	'192'	=>  "a", // À
 	'193'	=>  "a", // Á

From 333651d7bbb711e5861c1c6f98ef73c3e2f755a9 Mon Sep 17 00:00:00 2001
From: Gary Reckard <gary@happycog.com>
Date: Fri, 22 Nov 2019 13:07:22 -0500
Subject: [PATCH 003/123] Fix php opening tag

On the Debug Extensions page, if short tags is not on, the pagination would not show. I fixed the opening php tag.
---
 .../ee/EllisLab/ExpressionEngine/View/utilities/extensions.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/View/utilities/extensions.php b/system/ee/EllisLab/ExpressionEngine/View/utilities/extensions.php
index e6f3848fb6..5111199fbd 100644
--- a/system/ee/EllisLab/ExpressionEngine/View/utilities/extensions.php
+++ b/system/ee/EllisLab/ExpressionEngine/View/utilities/extensions.php
@@ -5,7 +5,7 @@
 		<h1><?=$cp_heading?></h1>
 		<div class="app-notice-wrap"><?=ee('CP/Alert')->getAllInlines()?></div>
 		<?php $this->embed('_shared/table', $table); ?>
-		<? if (isset($pagination)) echo $pagination; ?>
+		<?php if (isset($pagination)) echo $pagination; ?>
 		<?php if ($table['total_rows'] > 0): ?>
 		<fieldset class="tbl-bulk-act hidden">
 			<select name="bulk_action">

From ed9ebbc24e5d9b49f17fe61b41e1e1d4dc390c08 Mon Sep 17 00:00:00 2001
From: Brian Litzinger <litzinger@gmail.com>
Date: Fri, 6 Dec 2019 09:38:55 -0600
Subject: [PATCH 004/123] Update Cache_redis.php to prioritize the del()
 command over the deprecated delete() command

---
 system/ee/legacy/libraries/Cache/drivers/Cache_redis.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Cache/drivers/Cache_redis.php b/system/ee/legacy/libraries/Cache/drivers/Cache_redis.php
index 9550cded49..49b5c49d65 100755
--- a/system/ee/legacy/libraries/Cache/drivers/Cache_redis.php
+++ b/system/ee/legacy/libraries/Cache/drivers/Cache_redis.php
@@ -76,7 +76,14 @@ public function delete($key, $scope = Cache::LOCAL_SCOPE)
 		}
 
 		// Delete specific key
-		return ($this->_redis->delete($this->unique_key($key, $scope)) === 1);
+		if (method_exists($this->_redis, 'del'))
+		{
+			return ( $this->_redis->del($this->unique_key($key, $scope)) === 1);
+		}
+		else if (method_exists($this->_redis, 'delete'))
+		{
+			return ($this->_redis->delete($this->unique_key($key, $scope)) === 1);
+		}
 	}
 
 	/**

From e899d76d4b78195ca76cfa33e088ca00eb9d91d4 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Tue, 17 Dec 2019 10:16:08 +0200
Subject: [PATCH 005/123] Use correct variable name in Filemanager to avoid
 thumb creation error on Windows

---
 system/ee/legacy/libraries/Filemanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Filemanager.php b/system/ee/legacy/libraries/Filemanager.php
index b489d248be..40ef91bc54 100644
--- a/system/ee/legacy/libraries/Filemanager.php
+++ b/system/ee/legacy/libraries/Filemanager.php
@@ -1260,7 +1260,7 @@ function create_thumb($file_path, $prefs, $thumb = TRUE, $missing_only = TRUE)
 				return FALSE;
 			}
 
-			$resized_dir = rtrim(realpath($resized_path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+			$resized_path = rtrim(realpath($resized_path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
 			// Does the thumb image exist
 			if (file_exists($resized_path.$prefs['file_name']))

From 429790c52d99cbaddad2e7795dbe3f23ee9a25e4 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 15 Jan 2020 19:51:48 -0500
Subject: [PATCH 006/123] Casting variables as strings

---
 system/ee/legacy/models/snippet_model.php  | 4 ++--
 system/ee/legacy/models/template_model.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/ee/legacy/models/snippet_model.php b/system/ee/legacy/models/snippet_model.php
index 2076b33b84..a08d165c5e 100644
--- a/system/ee/legacy/models/snippet_model.php
+++ b/system/ee/legacy/models/snippet_model.php
@@ -131,7 +131,7 @@ public function __construct(array $snippets_row = array())
 	 */
 	public function __get($name)
 	{
-		if ( strpos('_', $name) === 0  OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0  OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}
@@ -146,7 +146,7 @@ public function __get($name)
 	 */
 	public function __set($name, $value)
 	{
-		if ( strpos('_', $name) === 0 OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0 OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}
diff --git a/system/ee/legacy/models/template_model.php b/system/ee/legacy/models/template_model.php
index 0ccb4b4282..be9e85504b 100644
--- a/system/ee/legacy/models/template_model.php
+++ b/system/ee/legacy/models/template_model.php
@@ -1199,7 +1199,7 @@ public function __construct(array $templates_row = array())
 	 */
 	public function __get($name)
 	{
-		if ( strpos('_', $name) === 0  OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0  OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}
@@ -1212,7 +1212,7 @@ public function __get($name)
 	 */
 	public function __set($name, $value)
 	{
-		if ( strpos('_', $name) === 0 OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0 OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}
@@ -1299,7 +1299,7 @@ public function __construct(array $groups_row = array())
 	 */
 	public function __get($name)
 	{
-		if ( strpos('_', $name) === 0  OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0  OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}
@@ -1312,7 +1312,7 @@ public function __get($name)
 	 */
 	public function __set($name, $value)
 	{
-		if ( strpos('_', $name) === 0 OR ! property_exists($this, $name))
+		if ( strpos('_', strval($name)) === 0 OR ! property_exists($this, $name))
 		{
 			throw new RuntimeException('Attempt to access non-existent property "' . $name . '"');
 		}

From 39a93c4eee7f105034332b84dc2e466c68295a94 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 15 Jan 2020 19:53:07 -0500
Subject: [PATCH 007/123] Adding changelog

---
 changelogs/patch.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..308aabbf37 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -3,10 +3,7 @@
 ExpressionEngine uses semantic versioning. This file contains changes to ExpressionEngine since the last Build / Version release for PATCH version changes only.
 
 ## Patch Release
-
-Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+- Fixed strpos `Non-string needles will be interpreted as strings in the future.` issue
 
 
 

From 3bb061a807200cdb53590bfe0565b34268d16346 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 16 Jan 2020 18:15:45 -0500
Subject: [PATCH 008/123] Adding check for hooks that should run

---
 .../ExpressionEngine/Service/Model/Model.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php b/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
index 3cb42875c5..287dbb0061 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
@@ -67,6 +67,11 @@ class Model extends SerializableEntity implements Subscriber, ValidationAware {
 	 */
 	protected $_foreign_keys = array();
 
+	/**
+	 * @var check if entry has saved already. Used in hooks
+	 */
+	protected $_has_saved = false;
+
 	/**
 	 * @var Type names and their corresponding classes
 	 */
@@ -600,6 +605,9 @@ protected function forwardEventToHooks($event)
 
 		foreach ($forwarded as $event => $hook)
 		{
+
+			if(!$this->hookShouldTrigger($hook)) continue; 
+
 			$this->on($event, function() use ($trigger, $hook, $that)
 			{
 				$addtl_args = func_get_args();
@@ -610,6 +618,28 @@ protected function forwardEventToHooks($event)
 		}
 	}
 
+	/**
+	 * checks if designated hook should fitre
+	 * @param  string $hook    Name of hook
+	 * @return boolean
+	 */
+	protected function hookShouldTrigger($hook)
+	{
+
+		$process = true;
+
+		if($hook == 'after_channel_entry_save') {
+			
+			if($this->_has_saved) $process = false;
+
+			$this->_has_saved = true;
+			
+		}
+
+		return $process;
+
+	}
+
 	/**
 	 * Returns a function that can be used to trigger a hook outside the current
 	 * object scope. Thank you PHP 5.3, you hunk of garbage.

From 570e9f269512701cf59d16ae98379b076f90224f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 16 Jan 2020 18:17:03 -0500
Subject: [PATCH 009/123] Adding changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..ba4163f6fd 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+- Fixes bug where `after_channel_entry_save` hook would run twice.
 
 
 

From 1a75fb18617511c14eb927e1988d6a74bd548f6f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 06:11:12 -0500
Subject: [PATCH 010/123] Adding system online caching

---
 .../ee/EllisLab/ExpressionEngine/Service/Updater/Runner.php | 6 +++++-
 .../ExpressionEngine/Updater/Service/Updater/Runner.php     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Updater/Runner.php b/system/ee/EllisLab/ExpressionEngine/Service/Updater/Runner.php
index 1dd0a3c0c1..d56e97c0fa 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Updater/Runner.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Updater/Runner.php
@@ -72,7 +72,11 @@ public function unpack()
 		$unpacker->moveUpdater();
 
 		$this->logger->log('Taking the site offline');
-		ee('Config')->getFile()->set('is_system_on', 'n', TRUE);
+
+		// We'll save the current system on setting
+		$config = ee('Config')->getFile();
+		$config->set('is_system_on_before_updater', $config->get('is_system_on', 'y'));
+		$config->set('is_system_on', 'n', TRUE);
 	}
 
 	public function rollback()
diff --git a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
index 47b57d0297..f73b9e7d56 100644
--- a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
+++ b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
@@ -208,7 +208,7 @@ public function restoreDatabase()
 	public function selfDestruct($rollback = NULL)
 	{
 		$config = ee('Config')->getFile();
-		$config->set('is_system_on', 'y', TRUE);
+		$config->set('is_system_on', $config->get('is_system_on_before_updater', 'y'), TRUE);
 		$config->set('app_version', APP_VER, TRUE);
 
 		// Legacy logger lib to log to update_log table

From 0d17c8898a5e5e5c76a9d6f385fd512bb843f3a6 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 06:14:00 -0500
Subject: [PATCH 011/123] Adding changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..7340231bfe 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
 
 
 

From e248ab5b6c565fdc14884853c68409dfd0e3d6e2 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 06:30:27 -0500
Subject: [PATCH 012/123] Adding ignored which in tag params

---
 system/ee/legacy/libraries/Template.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index 29e1fba042..d1b3aace37 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -109,6 +109,8 @@ class EE_Template {
 
 	protected $modified_vars      = FALSE;
 
+	protected $ignore_fetch		  = [ 'url_title' ];
+
 	/**
 	 * Constructor
 	 *
@@ -1903,6 +1905,13 @@ public function process_tags()
 	 */
 	public function fetch_param($which, $default = FALSE)
 	{
+
+		if(in_array($which, $this->ignore_fetch)) {
+
+			return $this->tagparams[$which];
+
+		}
+
 		if ( ! isset($this->tagparams[$which]))
 		{
 			return $default;

From e56fdbb0bebb829fd7657bf630fffa66e01d8d69 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 06:31:12 -0500
Subject: [PATCH 013/123] Changelog

---
 changelogs/patch.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..df92070435 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,10 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
-
-
+	- Ignores url_title in fetch param function, for issues related to URL titles called `n`
 
 EOF MARKER: This line helps prevent merge conflicts when things are
 added on the bottoms of lists

From 73ae6b3f8b6a8d7aed6eed90caded52ef19a4aff Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 08:09:51 -0500
Subject: [PATCH 014/123] Adding integer casting

---
 system/ee/legacy/libraries/Image_lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/ee/legacy/libraries/Image_lib.php b/system/ee/legacy/libraries/Image_lib.php
index ec5ef38d39..7398e6d5ed 100644
--- a/system/ee/legacy/libraries/Image_lib.php
+++ b/system/ee/legacy/libraries/Image_lib.php
@@ -948,19 +948,19 @@ function overlay_watermark()
 
 		if ($this->wm_vrt_alignment == 'B')
 		{
-			$this->wm_vrt_offset = $this->wm_vrt_offset * -1;
-			$y_padding = $y_padding * -1;
+			$this->wm_vrt_offset = ((int) $this->wm_vrt_offset) * -1;
+			$y_padding = ((int) $y_padding) * -1;
 		}
 
 		if ($this->wm_hor_alignment == 'R')
 		{
-			$this->wm_hor_offset = $this->wm_hor_offset * -1;
-			$x_padding = $x_padding * -1;
+			$this->wm_hor_offset = ((int) $this->wm_hor_offset) * -1;
+			$x_padding = ((int) $x_padding) * -1;
 		}
 
 		//  Set the base x and y axis values
-		$x_axis = $this->wm_hor_offset + $x_padding;
-		$y_axis = $this->wm_vrt_offset + $y_padding;
+		$x_axis = ((int) $this->wm_hor_offset) + ((int) $x_padding);
+		$y_axis = ((int) $this->wm_vrt_offset) + ((int) $y_padding);
 
 		//  Set the vertical position
 		switch ($this->wm_vrt_alignment)

From a3b2478504b51697ab7a3db1abe7bacf778341f9 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 08:09:58 -0500
Subject: [PATCH 015/123] Changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..94fb37039b 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Fixes variable type notices
 
 
 

From 0ce3e794f9f75384f55d79ac70e2218d75aad883 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 12:21:50 -0500
Subject: [PATCH 016/123] Fixing missing return

---
 system/ee/EllisLab/Addons/consent/mod.consent.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/Addons/consent/mod.consent.php b/system/ee/EllisLab/Addons/consent/mod.consent.php
index 58c4b9f202..7f6b7f2963 100644
--- a/system/ee/EllisLab/Addons/consent/mod.consent.php
+++ b/system/ee/EllisLab/Addons/consent/mod.consent.php
@@ -155,7 +155,9 @@ public function submitConsent()
 		else
 		{
 			$this->setAlertFlashdata('success', $message);
-			$return = ee('Encrypt')->decode(ee()->input->post('RET'));
+			$return = ee()->input->post('RET')
+						? ee('Encrypt')->decode(ee()->input->post('RET'))
+						: ee()->functions->form_backtrack(1);
 			ee()->functions->redirect(ee()->functions->create_url($return));
 		}
 	}

From 0e0c75b104d2b463e3bc081251f7ee8a2bdbc12e Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Jan 2020 12:23:07 -0500
Subject: [PATCH 017/123] Changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..4556c14904 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Added default to same page for consent return
 
 
 

From 6bc492371e5c426bfe103ad25407c270d73bbb3f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 07:27:52 -0500
Subject: [PATCH 018/123] Adding validation

---
 system/ee/EllisLab/Addons/pages/tab.pages.php | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/system/ee/EllisLab/Addons/pages/tab.pages.php b/system/ee/EllisLab/Addons/pages/tab.pages.php
index d52442e865..57a10bc48a 100644
--- a/system/ee/EllisLab/Addons/pages/tab.pages.php
+++ b/system/ee/EllisLab/Addons/pages/tab.pages.php
@@ -140,18 +140,43 @@ public function display($channel_id, $entry_id = '')
 	public function validate($entry, $values)
 	{
 		$validator = ee('Validation')->make(array(
-			'pages_template_id' => 'validTemplate',
-			'pages_uri' => 'validURI|validSegmentCount|notDuplicated',
+			'pages_template_id' => 'validTemplate|validHasTemplate',
+			'pages_uri' => 'validURI|validHasTemplate|validSegmentCount|notDuplicated',
 		));
 
 		$validator->defineRule('validTemplate', $this->makeValidTemplateRule($values));
 		$validator->defineRule('validURI', $this->makeValidURIRule());
 		$validator->defineRule('validSegmentCount', $this->makeValidSegmentCountRule());
 		$validator->defineRule('notDuplicated', $this->makeNotDuplicatedRule($entry));
+		$validator->defineRule('validHasTemplate', $this->makeValidHasTemplateRule($values));
 
 		return $validator->validate($values);
 	}
 
+	/**
+	 * Validates whether a pages URI has been selected with a template
+	 * @param  array 	$values array of pages values coming from tab
+	 * @return Closure The logic needed to validate the data.
+	 */
+	private function makeValidHasTemplateRule($values)
+	{
+
+		return function($field, $value) use($values)
+		{
+
+			if(
+				$values['pages_uri'] === ""
+				|| ($values['pages_uri'] !== "" && $values['pages_template_id'] === ""))
+			{
+				return 'invalid_template';
+			}
+
+			return true;
+
+		};
+
+	}
+
 	/**
 	 * Generates and returns a Closure suitable for a Validation Rule that
 	 * ensures the submitted value (a Template ID) is both set and is a number,

From 2fddab88a61c87c592bb21f28d2508d51c907508 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 07:29:37 -0500
Subject: [PATCH 019/123] Changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..6a38f50cd8 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Adds validation for pages URIs without a selected template
 
 
 

From c65e9908cb2f0bcd53b2f56b4fd2f337c7b25486 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 09:09:07 -0500
Subject: [PATCH 020/123] Fixing implode glue/pieces issue

Passing the $glue and $pieces parameters in reverse order to implode
has been deprecated since PHP 7.4; $glue should be the first parameter
and $pieces the second
---
 system/ee/EllisLab/Addons/channel/mod.channel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/ee/EllisLab/Addons/channel/mod.channel.php b/system/ee/EllisLab/Addons/channel/mod.channel.php
index 3d7bd9b6c9..fe9e906dc6 100644
--- a/system/ee/EllisLab/Addons/channel/mod.channel.php
+++ b/system/ee/EllisLab/Addons/channel/mod.channel.php
@@ -461,7 +461,7 @@ public function fetch_categories()
 				return;
 			}
 
-			$sql .= implode(array_unique(array_filter($categories)), ',') . ')';
+			$sql .= implode(',', array_unique(array_filter($categories))) . ')';
 
 			$sql .= " ORDER BY c.group_id, c.parent_id, c.cat_order";
 
@@ -2427,7 +2427,7 @@ public function build_sql_query($qstring = '')
 		//cache the entry_id
 		ee()->session->cache['channel']['entry_ids'] = $entries;
 
-		$end = "ORDER BY FIELD(t.entry_id, " . implode($entries, ',') . ")";
+		$end = "ORDER BY FIELD(t.entry_id, " . implode(',', $entries) . ")";
 
 		// modify the ORDER BY if displaying by week
 		if ($this->display_by == 'week' && isset($yearweek))
@@ -2521,7 +2521,7 @@ public function generateSQLForEntries(array $entries, array $channel_ids)
 
 		$sql .= $from;
 
-		$sql .= "WHERE t.entry_id IN (" . implode($entries, ',') . ")";
+		$sql .= "WHERE t.entry_id IN (" . implode(',', $entries) . ")";
 		return $sql;
 	}
 
@@ -2871,7 +2871,7 @@ public function parse_channel_entries($per_row_callback = NULL)
 
 	private function getExtraData($query_result)
 	{
-		$where = "WHERE t.entry_id IN (" . implode(ee()->session->cache['channel']['entry_ids'], ',') . ")";
+		$where = "WHERE t.entry_id IN (" . implode(',', ee()->session->cache['channel']['entry_ids']) . ")";
 
 		foreach ($this->chunks as $chunk)
 		{

From e4213a070ef02b289963199297c1afc9b234ba34 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 10:20:29 -0500
Subject: [PATCH 021/123] Removing deprecated gd fxn

Function dl() is deprecated since PHP 5.3
---
 system/ee/EllisLab/Addons/forum/mcp.forum.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/system/ee/EllisLab/Addons/forum/mcp.forum.php b/system/ee/EllisLab/Addons/forum/mcp.forum.php
index 4c5725c865..56beb3bb47 100644
--- a/system/ee/EllisLab/Addons/forum/mcp.forum.php
+++ b/system/ee/EllisLab/Addons/forum/mcp.forum.php
@@ -3958,15 +3958,9 @@ private function installSpecialtyTemplates($site_id)
 	 */
 	private function isGdAvailable()
 	{
-		if (! extension_loaded('gd'))
-		{
-			if (! function_exists('dl') OR ! @dl('gd.so'))
-			{
-				return FALSE;
-			}
-		}
 
-		return TRUE;
+		return extension_loaded('gd');
+
 	}
 
 	/**

From 2d2a578c98b561d8d7331c7729739f81b8cb1e61 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 10:22:26 -0500
Subject: [PATCH 022/123] Fixing implode glue/pieces issue

Passing the $glue and $pieces parameters in reverse order to implode has
been deprecated since PHP 7.4; $glue should be the first parameter and
$pieces the second
---
 system/ee/EllisLab/Addons/rte/mcp.rte.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/Addons/rte/mcp.rte.php b/system/ee/EllisLab/Addons/rte/mcp.rte.php
index 2a2e80a79f..38cf8e0b31 100755
--- a/system/ee/EllisLab/Addons/rte/mcp.rte.php
+++ b/system/ee/EllisLab/Addons/rte/mcp.rte.php
@@ -211,7 +211,7 @@ public function prefs_update()
 		ee()->form_validation->set_rules(
 			'rte_default_toolset_id',
 			lang('default_toolset'),
-			'required|is_numeric|enum[' . implode($toolids, ',') . ']'
+			'required|is_numeric|enum[' . implode(',', $toolids) . ']'
 		);
 
 		if (ee()->form_validation->run())

From 15782aab7e0ce052ea06b6b408aa0c83beae8f5b Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 21 Jan 2020 10:27:29 -0500
Subject: [PATCH 023/123] Removing ini_get safe_mode

INI directive 'safe_mode' is deprecated since PHP 5.3 and removed
since PHP 5.4
---
 system/ee/EllisLab/ExpressionEngine/Core/Core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Core/Core.php b/system/ee/EllisLab/ExpressionEngine/Core/Core.php
index 9002a34c91..b8e375b621 100644
--- a/system/ee/EllisLab/ExpressionEngine/Core/Core.php
+++ b/system/ee/EllisLab/ExpressionEngine/Core/Core.php
@@ -289,7 +289,7 @@ protected function getErrorRouting()
 	 */
 	public function setTimeLimit($t)
 	{
-		if (function_exists("set_time_limit") && @ini_get("safe_mode") == 0)
+		if (function_exists("set_time_limit"))
 		{
 			@set_time_limit($t);
 		}

From 699ec269a49a07715febd51aaaaff7d2afa7acb9 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:16:30 -0500
Subject: [PATCH 024/123] Removing safe_mode

INI directive 'safe_mode' is deprecated since PHP 5.3 and removed
since PHP 5.4
---
 .../EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
index 8982dcadf7..cb17554e92 100644
--- a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
@@ -538,7 +538,7 @@ public function chmod($path, $mode)
 	public function isWritable($path)
 	{
 		// If we're on a Unix server with safe_mode off we call is_writable
-		if (DIRECTORY_SEPARATOR == '/' AND @ini_get("safe_mode") == FALSE)
+		if (DIRECTORY_SEPARATOR == '/')
 		{
 			return is_writable($this->normalize($path));
 		}

From b4d33e579a7934a02bd003db3f84fb48f116329d Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:23:43 -0500
Subject: [PATCH 025/123] Adding note about deprecation for money format

Function money_format() is deprecated since PHP 7.4; Use
NumberFormatter::formatCurrency() instead

Given that, the `money_format` function called here serves only
as a backup for older systems, I chose to add a note here instead
of actively removing the call.
---
 .../ExpressionEngine/Service/Formatter/Formats/Number.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Number.php b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Number.php
index 72c3b3e00a..79278483b3 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Number.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Number.php
@@ -11,6 +11,7 @@
 namespace EllisLab\ExpressionEngine\Service\Formatter\Formats;
 
 use EllisLab\ExpressionEngine\Service\Formatter\Formatter;
+use NumberFormatter;
 
 /**
  * Formatter\Number
@@ -105,6 +106,7 @@ public function currency($options = [])
 		// This is intentionally a 20% effort, 80% solution situation rather than maintaining our own
 		// localization formatting lookup tables. The 100% solution is easily achieved by ensuring
 		// that the intl extension is loaded in PHP, handled above.
+		// NOTE: `money_format` is deprecated in PHP7.4
 		if (function_exists('money_format'))
 		{
 			// grab the current monetary locale to reset after formatting

From fe63cc95d03c530c12f8266c0e66470f5419ecdc Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:27:43 -0500
Subject: [PATCH 026/123] Fixing object soft reserved keyword

'object' is a soft reserved keyword as of PHP version 7.0 and a
reserved keyword as of PHP version 7.2 and should not be used to name
a class, interface or trait or as part of a namespace (T_NAMESPACE).

Chose to make change to namespace, since this is the only place this
is utilized.
---
 .../ExpressionEngine/Service/Model/Column/Object/Timestamp.php  | 2 +-
 system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php b/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php
index 1466e34364..a2cca08dfe 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php
@@ -8,7 +8,7 @@
  * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
  */
 
-namespace EllisLab\ExpressionEngine\Service\Model\Column\Object;
+namespace EllisLab\ExpressionEngine\Service\Model\Column\ColumnObject;
 
 use DateTime;
 use EllisLab\ExpressionEngine\Service\Model\Column\SerializedType;
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php b/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
index 3cb42875c5..1dce2ba334 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Model/Model.php
@@ -85,7 +85,7 @@ class Model extends SerializableEntity implements Subscriber, ValidationAware {
 		'yesNo' => 'EllisLab\ExpressionEngine\Service\Model\Column\Scalar\YesNo',
 		'boolString' => 'EllisLab\ExpressionEngine\Service\Model\Column\Scalar\YesNo',
 
-		'timestamp' => 'EllisLab\ExpressionEngine\Service\Model\Column\Object\Timestamp',
+		'timestamp' => 'EllisLab\ExpressionEngine\Service\Model\Column\ColumnObject\Timestamp',
 
 		'base64' => 'EllisLab\ExpressionEngine\Service\Model\Column\Serialized\Base64',
 		'base64Array' => 'EllisLab\ExpressionEngine\Service\Model\Column\Serialized\Base64Array',

From a1e0fbf25afbb167db0896c14dfa51a57a9fce70 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:45:41 -0500
Subject: [PATCH 027/123] Fixing global non-bare variables

Global with anything other than bare variables is discouraged
since PHP 7.0.

Documentation: https://www.php.net/manual/en/migration70.incompatible
.php#migration70.incompatible.variable-handling.global
---
 system/ee/legacy/core/Input.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
index 424da2b378..06ea004809 100644
--- a/system/ee/legacy/core/Input.php
+++ b/system/ee/legacy/core/Input.php
@@ -829,7 +829,7 @@ function _sanitize_globals()
 			{
 				if ( ! in_array($global, $protected))
 				{
-					global $$global;
+					global ${$global};
 					$$global = NULL;
 				}
 			}
@@ -839,7 +839,7 @@ function _sanitize_globals()
 				{
 					if ( ! in_array($key, $protected))
 					{
-						global $$key;
+						global ${$key};
 						$$key = NULL;
 					}
 				}

From b179f33afdab0c26db909ba05c1a8f809668bbc0 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:49:25 -0500
Subject: [PATCH 028/123] Fixing regex

preg_replace() - /e modifier is deprecated since PHP 5.5 and removed
since PHP 7.0
---
 system/ee/legacy/libraries/Functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Functions.php b/system/ee/legacy/libraries/Functions.php
index bfcc01d5b3..35bee03d35 100644
--- a/system/ee/legacy/libraries/Functions.php
+++ b/system/ee/legacy/libraries/Functions.php
@@ -1814,7 +1814,7 @@ public function bm_qstr_decode($str)
 		$str = str_replace("%uFFD4", "\'",		$str);
 		$str = str_replace("%uFFD5", "\'",		$str);
 
-		$str =	preg_replace("/\%u([0-9A-F]{4,4})/e","'&#'.base_convert('\\1',16,10).';'", $str);
+		$str =	preg_replace("/\%u([0-9A-F]{4,4})/","'&#'.base_convert('\\1',16,10).';'", $str);
 
 		$str = ee('Security/XSS')->clean(stripslashes(urldecode($str)));
 

From bb315a5bff4ce2d98ce32256c0719e913bc8c7ce Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:52:06 -0500
Subject: [PATCH 029/123] Removing safe mode

INI directive 'safe_mode' is deprecated since PHP and removed
since PHP 5.4
---
 system/ee/legacy/libraries/Email.php | 34 ++++++++--------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/system/ee/legacy/libraries/Email.php b/system/ee/legacy/libraries/Email.php
index fe7df7c720..6a2a1e9352 100644
--- a/system/ee/legacy/libraries/Email.php
+++ b/system/ee/legacy/libraries/Email.php
@@ -194,13 +194,6 @@ class EE_Email {
 	 */
 	public $bcc_batch_size	= 200;
 
-	/**
-	 * Whether PHP is running in safe mode. Initialized by the class constructor.
-	 *
-	 * @var	bool
-	 */
-	protected $_safe_mode		= FALSE;
-
 	/**
 	 * Subject header
 	 *
@@ -360,7 +353,6 @@ function __construct()
 		$this->charset = config_item('charset');
 
 		$this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === '');
-		$this->_safe_mode = (bool) @ini_get('safe_mode');
 
 		$this->charset = strtoupper($this->charset);
 
@@ -407,7 +399,6 @@ public function initialize($config = array())
 		$this->clear();
 
 		$this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === '');
-		$this->_safe_mode = (bool) @ini_get('safe_mode');
 
 		return $this;
 	}
@@ -1631,25 +1622,18 @@ protected function _send_with_mail()
 			$this->_recipients = implode(', ', $this->_recipients);
 		}
 
-		if ($this->_safe_mode === TRUE)
+		$params = NULL;
+		$return_path = $this->clean_email($this->_headers['Return-Path']);
+
+		// CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+		if ($this->isShellSafe($return_path))
 		{
-			return mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str);
+			// most documentation of sendmail using the "-f" flag lacks a space after it, however
+			// we've encountered servers that seem to require it to be in place.
+			$params = '-f '.$return_path;
 		}
-		else
-		{
-			$params = NULL;
-			$return_path = $this->clean_email($this->_headers['Return-Path']);
 
-			// CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-			if ($this->isShellSafe($return_path))
-			{
-				// most documentation of sendmail using the "-f" flag lacks a space after it, however
-				// we've encountered servers that seem to require it to be in place.
-				$params = '-f '.$return_path;
-			}
-
-			return mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str, $params);
-		}
+		return mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str, $params);
 	}
 
 	/**

From 237342160df3b7ffa842a0552c98e99f91c30a10 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:53:50 -0500
Subject: [PATCH 030/123] Removing ze1_compatibility_mode

INI directive 'zend.ze1_compatibility_mode' is removed since PHP 5.3
---
 system/ee/legacy/libraries/simplepie/SimplePie.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/simplepie/SimplePie.php b/system/ee/legacy/libraries/simplepie/SimplePie.php
index 0d5614ced1..d9dacbad22 100755
--- a/system/ee/legacy/libraries/simplepie/SimplePie.php
+++ b/system/ee/legacy/libraries/simplepie/SimplePie.php
@@ -706,7 +706,7 @@ public function __toString()
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()))
 		{
 			if (!empty($this->data['items']))
 			{

From 10017400ef820879a3e31a1b77147ccb14645938 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:55:53 -0500
Subject: [PATCH 031/123] Removing safe mode

INI directive 'safe_mode' is deprecated since PHP 5.3 and
removed since PHP 5.4
---
 system/ee/legacy/libraries/simplepie/SimplePie/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/simplepie/SimplePie/File.php b/system/ee/legacy/libraries/simplepie/SimplePie/File.php
index 8593c329e5..f3b4d5a477 100755
--- a/system/ee/legacy/libraries/simplepie/SimplePie/File.php
+++ b/system/ee/legacy/libraries/simplepie/SimplePie/File.php
@@ -109,7 +109,7 @@ public function __construct($url, $timeout = 10, $redirects = 5, $headers = null
 				curl_setopt($fp, CURLOPT_REFERER, $url);
 				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
 				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
+				if (!ini_get('open_basedir') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
 				{
 					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
 					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);

From d3e164302c83c0be9a141743f639900427126cf4 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:56:56 -0500
Subject: [PATCH 032/123] Fixing implode glue pieces parse order

Passing the $glue and $pieces parameters in reverse order to implode
has been deprecated since PHP 7.4; $glue should be the first parameter
and $pieces the second
---
 system/ee/legacy/libraries/simplepie/SimplePie/Parse/Date.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/ee/legacy/libraries/simplepie/SimplePie/Parse/Date.php b/system/ee/legacy/libraries/simplepie/SimplePie/Parse/Date.php
index 1f21566556..6f021eddfa 100755
--- a/system/ee/legacy/libraries/simplepie/SimplePie/Parse/Date.php
+++ b/system/ee/legacy/libraries/simplepie/SimplePie/Parse/Date.php
@@ -541,8 +541,8 @@ class SimplePie_Parse_Date
 	 */
 	public function __construct()
 	{
-		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+		$this->day_pcre = '(' . implode('|', array_keys($this->day)) . ')';
+		$this->month_pcre = '(' . implode('|', array_keys($this->month)) . ')';
 
 		static $cache;
 		if (!isset($cache[get_class($this)]))

From e1a5913aa93381b456b5fdc1f98106b451335c36 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 22 Jan 2020 05:58:07 -0500
Subject: [PATCH 033/123] Removing zend.ze1_compatibility_mode

INI directive 'zend.ze1_compatibility_mode' is removed since PHP 5.3
---
 system/ee/legacy/libraries/simplepie/SimplePie/Item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/simplepie/SimplePie/Item.php b/system/ee/legacy/libraries/simplepie/SimplePie/Item.php
index 3979b8f1b1..daa60d2689 100755
--- a/system/ee/legacy/libraries/simplepie/SimplePie/Item.php
+++ b/system/ee/legacy/libraries/simplepie/SimplePie/Item.php
@@ -121,7 +121,7 @@ public function __toString()
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()))
 		{
 			unset($this->feed);
 		}

From df92fa9edd343476b766d801a442db61cc967783 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 3 Feb 2020 15:07:19 -0500
Subject: [PATCH 034/123] Initial multibyte helper

---
 system/ee/legacy/helpers/multibyte_helper.php | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 system/ee/legacy/helpers/multibyte_helper.php

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
new file mode 100644
index 0000000000..c3d4c80365
--- /dev/null
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -0,0 +1,76 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed.');
+
+/**
+ * This source file is part of the open source project
+ * ExpressionEngine (https://expressionengine.com)
+ *
+ * @link      https://expressionengine.com/
+ * @copyright Copyright (c) 2003-2019, EllisLab Corp. (https://ellislab.com)
+ * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
+ */
+
+/**
+ * Multibyte Helpers
+ */
+
+/**
+ * Replace deprecated mb_string
+ * @param  string $str
+ * @param  string $encoding
+ * @return integer
+ */
+if ( ! function_exists('ee_mb_string'))
+{
+
+	function ee_mb_string( $str, $encoding = null ) {
+
+		if ( null === $encoding ) {
+
+			$encoding = ee()->config->item('charset') ?: 'utf8';
+
+		}
+
+		// If standard encoding, strlen works just fine
+		if ( ! in_array( strtolower($encoding), array( 'utf8', 'utf-8' ) ) ) {
+
+			return strlen( $str );
+
+		}
+
+		// Check byte count
+		$regex = '/(?:
+			[\x00-\x7F]                  # single-byte sequences   0xxxxxxx
+			| [\xC2-\xDF][\x80-\xBF]       # double-byte sequences   110xxxxx 10xxxxxx
+			| \xE0[\xA0-\xBF][\x80-\xBF]   # triple-byte sequences   1110xxxx 10xxxxxx * 2
+			| [\xE1-\xEC][\x80-\xBF]{2}
+			| \xED[\x80-\x9F][\x80-\xBF]
+			| [\xEE-\xEF][\x80-\xBF]{2}
+			| \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
+			| [\xF1-\xF3][\x80-\xBF]{3}
+			| \xF4[\x80-\x8F][\x80-\xBF]{2}
+		)/x';
+
+		// Start at 1 instead of 0 since the first thing we do is decrement.
+		$count = 1;
+
+		do {
+			// We had some string left over from the last round, but we counted it in that last round.
+			$count--;
+
+			/*
+			 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
+			 * the rest of the string).
+			 */
+			$pieces = preg_split( $regex, $str, 1000 );
+
+			// Increment.
+			$count += count( $pieces );
+
+			// If there's anything left over, repeat the loop.
+		} while ( $str = array_pop( $pieces ) );
+
+		// Fencepost: preg_split() always returns one extra item in the array.
+		return --$count;
+	}
+
+}
\ No newline at end of file

From 80b1b6a5546af30a27c4fd1589a4691394f9018e Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 4 Feb 2020 09:00:43 -0500
Subject: [PATCH 035/123] Removing mb_strlen

---
 .../Library/Vectorizers/ASCIIPrintable.php    | 13 ++++++++++++-
 .../spam/Library/Vectorizers/Entropy.php      | 12 +++++++++++-
 .../spam/Library/Vectorizers/Punctuation.php  | 13 ++++++++++++-
 .../spam/Library/Vectorizers/Spaces.php       | 15 ++++++++++++++-
 .../Compat/Random/byte_safe_strings.php       |  5 ++++-
 .../Service/Encrypt/Encrypt.php               | 18 +++++++++++++-----
 .../Service/Formatter/Formats/Text.php        | 11 ++++++++---
 .../Service/Validation/Rule/ExactLength.php   |  9 ++++-----
 .../Service/Validation/Rule/MaxLength.php     |  9 ++++-----
 .../Service/Validation/Rule/MinLength.php     |  9 ++++-----
 system/ee/legacy/helpers/download_helper.php  |  4 +++-
 system/ee/legacy/libraries/Encrypt.php        | 11 ++++++-----
 .../ee/legacy/libraries/Form_validation.php   | 19 ++++---------------
 system/ee/legacy/libraries/Upload.php         |  3 ++-
 14 files changed, 101 insertions(+), 50 deletions(-)

diff --git a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/ASCIIPrintable.php b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/ASCIIPrintable.php
index 923eb4fe4c..8f6634d1fa 100644
--- a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/ASCIIPrintable.php
+++ b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/ASCIIPrintable.php
@@ -26,17 +26,28 @@ class ASCIIPrintable implements Vectorizer {
 	 */
 	public function vectorize($source)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$non_ascii  = preg_match_all('/[^\x20-\x7E]/u', $source, $matches);
-		$length = mb_strlen($source);
+
+		$length = ee_mb_strlen($source);
+
 		if ($length !== 0)
 		{
+
 			$ratio = $non_ascii / $length;
+
 		}
 		else
 		{
+
 			$ratio = 1;
+
 		}
+
 		return $ratio;
+
 	}
 
 }
diff --git a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Entropy.php b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Entropy.php
index 997cc1d894..ccdd15734d 100644
--- a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Entropy.php
+++ b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Entropy.php
@@ -26,20 +26,30 @@ class Entropy implements Vectorizer {
 	 */
 	public function vectorize($source)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$length = mb_strlen($source);
 
 		if ($length > 0)
 		{
+
 			$compressed = gzcompress($source);
-			$compressed_length = mb_strlen($compressed) - 8; // 8 bytes of gzip overhead
+
+			$compressed_length = ee_mb_strlen($compressed) - 8; // 8 bytes of gzip overhead
+
 			$ratio = $compressed_length / $length;
+
 		}
 		else
 		{
+
 			$ratio = 0;
+
 		}
 
 		return $ratio;
+
 	}
 
 }
diff --git a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Punctuation.php b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Punctuation.php
index a62ee6ed9f..c7cb4dde9e 100644
--- a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Punctuation.php
+++ b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Punctuation.php
@@ -26,17 +26,28 @@ class Punctuation implements Vectorizer {
 	 */
 	public function vectorize($source)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$punctuation = preg_match_all('/[!-~]/u', $source, $matches);
-		$characters  = mb_strlen($source);
+
+		$characters  = ee_mb_strlen($source);
+
 		if ($characters !== 0)
 		{
+
 			$ratio = $punctuation / $characters;
+
 		}
 		else
 		{
+
 			$ratio = 1;
+
 		}
+
 		return $ratio;
+
 	}
 
 }
diff --git a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Spaces.php b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Spaces.php
index 7c0f784199..5d41af90b5 100644
--- a/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Spaces.php
+++ b/system/ee/EllisLab/Addons/spam/Library/Vectorizers/Spaces.php
@@ -26,17 +26,30 @@ class Spaces implements Vectorizer {
 	 */
 	public function vectorize($source)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$whitespace = preg_match_all('/\s/u', $source, $matches);
-		$characters  = mb_strlen($source);
+
+		$characters  = ee_mb_strlen($source);
+
 		if ($characters !== 0)
 		{
+
 			$ratio = $whitespace / $characters;
+
 		}
+
 		else
+
 		{
+
 			$ratio = 1;
+
 		}
+
 		return $ratio;
+
 	}
 
 }
diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
index 3de86b223c..cfd05d1f44 100755
--- a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
@@ -51,7 +51,10 @@ function RandomCompat_strlen($binary_string)
                 );
             }
 
-            return (int) mb_strlen($binary_string, '8bit');
+
+            ee()->load->helper('multibyte');
+
+            return (int) ee_mb_strlen($binary_string, '8bit');
         }
 
     } else {
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php b/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
index 765056420d..c9ee734cdf 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
@@ -45,8 +45,13 @@ class Encrypt {
 	 */
 	public function __construct($key)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$this->default_key = $key;
+
 		$this->mb_available = extension_loaded('mbstring');
+
 	}
 
 	/**
@@ -110,7 +115,10 @@ public function decrypt($data, $key = '')
 		$iv_size = openssl_cipher_iv_length($this->method);
 
 		$iv = ($this->mb_available) ? mb_substr($data, 0, $iv_size, 'ascii') : substr($data, 0, $iv_size);
-		$data = ($this->mb_available) ? mb_substr($data, $iv_size, mb_strlen($data, 'ascii'), 'ascii') : substr($data, $iv_size);
+		
+		$data = ($this->mb_available)
+					? mb_substr($data, $iv_size, ee_mb_strlen($data, 'ascii'), 'ascii')
+					: substr($data, $iv_size);
 
 		return openssl_decrypt($data, $this->method, $key, $this->options, $iv);
 	}
@@ -130,9 +138,9 @@ public function decrypt($data, $key = '')
 	protected function addNoise($data, $key)
 	{
 		$keyhash = sha1($key);
-		$keylen = ($this->mb_available) ? mb_strlen($keyhash, 'ascii') : strlen($keyhash);
+		$keylen = ee_mb_strlen($keyhash, 'ascii');
 		$str = '';
-		$len = ($this->mb_available) ? mb_strlen($data, 'ascii') : strlen($data);
+		$len = ee_mb_strlen($data, 'ascii');
 
         for ($i = 0, $j = 0, $len; $i < $len; ++$i, ++$j)
 		{
@@ -160,9 +168,9 @@ protected function addNoise($data, $key)
 	protected function removeNoise($data, $key)
 	{
 		$keyhash = sha1($key);
-		$keylen = ($this->mb_available) ? mb_strlen($keyhash, 'ascii') : strlen($keyhash);
+		$keylen = ee_mb_strlen($keyhash, 'ascii');
 		$str = '';
-		$len = ($this->mb_available) ? mb_strlen($data, 'ascii') : strlen($data);
+		$len = ee_mb_strlen($data, 'ascii');
 
 		for ($i = 0, $j = 0, $len; $i < $len; ++$i, ++$j)
 		{
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
index 6078bafba3..f7bc3f9f28 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
@@ -24,8 +24,13 @@ class Text extends Formatter {
 
 	public function __construct($content, $lang, $session, $config, $options)
 	{
+
+		ee()->load->helper('multibyte');
+
 		$this->multibyte = extension_loaded('mbstring');
+
 		parent::__construct($content, $lang, $session, $config, $options);
+
 	}
 
 	/**
@@ -407,7 +412,7 @@ public function json($options = [])
 	 */
 	public function length()
 	{
-		$this->content = ($this->multibyte) ? mb_strlen($this->content, 'utf8') : strlen($this->content);
+		$this->content = ee_mb_strlen($this->content, 'utf8');
 		return $this;
 	}
 
@@ -424,7 +429,7 @@ public function limitChars($options = [])
 		$preserve_words = (isset($options['preserve_words'])) ? $options['preserve_words'] : FALSE;
 		$this->content = strip_tags($this->content);
 
-		$length = ($this->multibyte) ? mb_strlen($this->content, 'utf8') : strlen($this->content);
+		$length = ee_mb_strlen($this->content, 'utf8');
 
 		if ($length < $limit)
 		{
@@ -441,7 +446,7 @@ public function limitChars($options = [])
 			)
 		);
 
-		$length = ($this->multibyte) ? mb_strlen($this->content, 'utf8') : strlen($this->content);
+		$length = ee_mb_strlen($this->content, 'utf8');
 
 		if ($length <= $limit)
 		{
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
index 874782c8a1..e70d97da53 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
@@ -19,6 +19,9 @@ class ExactLength extends ValidationRule {
 
 	public function validate($key, $value)
 	{
+
+		ee()->load->helper('multibyte');
+
 		list($length) = $this->assertParameters('length');
 
 		$length = $this->numericOrConstantParameter($length);
@@ -28,12 +31,8 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($value) != $length) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($value) < $length) ? FALSE : TRUE;
 
-		return (strlen($value) != $length) ? FALSE : TRUE;
 	}
 
 	public function getLanguageKey()
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
index a4aca5ca97..cce1c3bc98 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
@@ -19,6 +19,9 @@ class MaxLength extends ValidationRule {
 
 	public function validate($key, $value)
 	{
+
+		ee()->load->helper('multibyte');
+		
 		list($length) = $this->assertParameters('length');
 
 		$length = $this->numericOrConstantParameter($length);
@@ -28,12 +31,8 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($value) > $length) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($value) < $length) ? FALSE : TRUE;
 
-		return (strlen($value) > $length) ? FALSE : TRUE;
 	}
 
 	public function getLanguageKey()
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MinLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MinLength.php
index e065dda442..3f31640665 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MinLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MinLength.php
@@ -19,6 +19,9 @@ class MinLength extends ValidationRule {
 
 	public function validate($key, $value)
 	{
+
+		ee()->load->helper('multibyte');
+
 		list($length) = $this->assertParameters('length');
 
 		$length = $this->numericOrConstantParameter($length);
@@ -28,12 +31,8 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($value) < $length) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($value) < $length) ? FALSE : TRUE;
 
-		return (strlen($value) < $length) ? FALSE : TRUE;
 	}
 
 	public function getLanguageKey()
diff --git a/system/ee/legacy/helpers/download_helper.php b/system/ee/legacy/helpers/download_helper.php
index c357fff9b2..50e241e967 100644
--- a/system/ee/legacy/helpers/download_helper.php
+++ b/system/ee/legacy/helpers/download_helper.php
@@ -33,9 +33,11 @@ function force_download($filename = '', $data = '')
 		}
 
 		ee()->load->library('mime_type');
+		ee()->load->helper('multibyte');
+
 		$mime = ee()->mime_type->ofBuffer($data);
 
-		$len = (function_exists('mb_strlen')) ? mb_strlen($data, '8bit') : strlen($data);
+		$len = ee_mb_strlen($data, '8bit');
 
 		// Generate the server headers
 		if (strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") !== FALSE)
diff --git a/system/ee/legacy/libraries/Encrypt.php b/system/ee/legacy/libraries/Encrypt.php
index 642544c280..0a15c297da 100644
--- a/system/ee/legacy/libraries/Encrypt.php
+++ b/system/ee/legacy/libraries/Encrypt.php
@@ -32,6 +32,7 @@ public function __construct()
 	{
 		$this->_mcrypt_exists = ( ! function_exists('mcrypt_encrypt')) ? FALSE : TRUE;
 		$this->mb_available = (MB_ENABLED) ?: extension_loaded('mbstring');
+		ee()->load->helper('multibyte');
 		log_message('debug', "Encrypt Class Initialized");
 	}
 
@@ -279,7 +280,7 @@ function mcrypt_decode($data, $key)
 	{
 		$data = $this->_remove_cipher_noise($data, $key);
 		$init_size = mcrypt_get_iv_size($this->_get_cipher(), $this->_get_mode());
-		$mb_adjusted_data_length =  ($this->mb_available) ? mb_strlen($data, 'ascii') : strlen($data);
+		$mb_adjusted_data_length =  ee_mb_strlen($data, 'ascii');
 
 		if ($init_size > $mb_adjusted_data_length)
 		{
@@ -306,9 +307,9 @@ function mcrypt_decode($data, $key)
 	function _add_cipher_noise($data, $key)
 	{
 		$keyhash = $this->hash($key);
-		$keylen = ($this->mb_available) ? mb_strlen($keyhash, 'ascii') : strlen($keyhash);
+		$keylen = ee_mb_strlen($keyhash, 'ascii');
 		$str = '';
-		$len = ($this->mb_available) ? mb_strlen($data, 'ascii') : strlen($data);
+		$len = ee_mb_strlen($data, 'ascii');
 
         for ($i = 0, $j = 0, $len; $i < $len; ++$i, ++$j)
 		{
@@ -336,9 +337,9 @@ function _add_cipher_noise($data, $key)
 	function _remove_cipher_noise($data, $key)
 	{
 		$keyhash = $this->hash($key);
-		$keylen = ($this->mb_available) ? mb_strlen($keyhash, 'ascii') : strlen($keyhash);
+		$keylen = ee_mb_strlen($keyhash, 'ascii');
 		$str = '';
-		$len = ($this->mb_available) ? mb_strlen($data, 'ascii') : strlen($data);
+		$len = ee_mb_strlen($data, 'ascii');
 
 		for ($i = 0, $j = 0, $len; $i < $len; ++$i, ++$j)
 		{
diff --git a/system/ee/legacy/libraries/Form_validation.php b/system/ee/legacy/libraries/Form_validation.php
index 68c2ca787d..c63b6856cc 100644
--- a/system/ee/legacy/libraries/Form_validation.php
+++ b/system/ee/legacy/libraries/Form_validation.php
@@ -39,6 +39,7 @@ function __construct($rules = array())
 
 		// Automatically load the form helper
 		ee()->load->helper('form');
+		ee()->load->helper('multibyte');
 
 		// Set the character encoding in MB.
 		if (function_exists('mb_internal_encoding'))
@@ -1610,12 +1611,8 @@ function min_length($str, $val)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($str) < $val) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($str) < $val) ? FALSE : TRUE;
 
-		return (strlen($str) < $val) ? FALSE : TRUE;
 	}
 
 	/**
@@ -1633,12 +1630,8 @@ function max_length($str, $val)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($str) > $val) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($str) > $val) ? FALSE : TRUE;
 
-		return (strlen($str) > $val) ? FALSE : TRUE;
 	}
 
 	/**
@@ -1656,12 +1649,8 @@ function exact_length($str, $val)
 			return FALSE;
 		}
 
-		if (function_exists('mb_strlen'))
-		{
-			return (mb_strlen($str) != $val) ? FALSE : TRUE;
-		}
+		return (ee_mb_strlen($str) != $val) ? FALSE : TRUE;
 
-		return (strlen($str) != $val) ? FALSE : TRUE;
 	}
 
 	/**
diff --git a/system/ee/legacy/libraries/Upload.php b/system/ee/legacy/libraries/Upload.php
index 5d0038af35..d2a04e829e 100644
--- a/system/ee/legacy/libraries/Upload.php
+++ b/system/ee/legacy/libraries/Upload.php
@@ -55,6 +55,7 @@ function __construct($props = array())
 		}
 
 		ee()->load->helper('xss');
+		ee()->load->helper('multibyte');
 
 		$props['xss_clean'] = xss_check();
 
@@ -98,7 +99,7 @@ public function raw_upload($name, $data)
 
 		$_FILES['userfile'] = array(
 			'name' => $name,
-			'size' => mb_strlen($data),
+			'size' => ee_mb_strlen($data),
 			'tmp_name' => $tmp,
 			'error' => UPLOAD_ERR_OK
 		);

From 9d24a4f1a028b8dc9e030c41a7a498b6350f6118 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 4 Feb 2020 09:07:50 -0500
Subject: [PATCH 036/123] Removing mb_strpos

---
 .../Service/Formatter/Formats/Text.php        |  2 +-
 system/ee/legacy/helpers/multibyte_helper.php | 67 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
index f7bc3f9f28..957d3ee336 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
@@ -460,7 +460,7 @@ public function limitChars($options = [])
 			$this->content = wordwrap($this->content, $limit, "\n", true);
 
 			$cut = ($this->multibyte)
-				? mb_substr($this->content, 0, mb_strpos($this->content, "\n"), 'utf8')
+				? mb_substr($this->content, 0, ee_mb_strpos($this->content, "\n"), 'utf8')
 				: substr($this->content, 0, strpos($this->content, "\n"));
 		}
 		else
diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index c3d4c80365..a87220cb50 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -13,16 +13,53 @@
  * Multibyte Helpers
  */
 
+if ( ! function_exists( 'ee_get_encoding' ) )
+{
+	function ee_get_encoding($encoding)
+	{
+
+		if (null === $encoding) {
+
+		    return ee()->config->item('charset') ?: 'utf8';
+
+		}
+
+		if ('UTF-8' === $encoding) {
+
+		    return 'UTF-8';
+
+		}
+
+		$encoding = strtoupper($encoding);
+
+		if ( '8BIT' === $encoding || 'BINARY' === $encoding ) {
+
+		    return 'CP850';
+
+		}
+
+		if ( 'UTF8' === $encoding ) {
+
+		    return 'UTF-8';
+
+		}
+
+		return $encoding;
+
+	}
+
+}
+
 /**
  * Replace deprecated mb_string
  * @param  string $str
  * @param  string $encoding
  * @return integer
  */
-if ( ! function_exists('ee_mb_string'))
+if ( ! function_exists('ee_mb_strlen'))
 {
 
-	function ee_mb_string( $str, $encoding = null ) {
+	function ee_mb_strlen( $str, $encoding = null ) {
 
 		if ( null === $encoding ) {
 
@@ -73,4 +110,30 @@ function ee_mb_string( $str, $encoding = null ) {
 		return --$count;
 	}
 
+}
+
+if ( ! function_exists('ee_mb_strpos')) {
+
+	function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
+	{
+	    $encoding = ee_get_encoding($encoding);
+
+	    if ('CP850' === $encoding || 'ASCII' === $encoding) {
+
+	        return strpos($haystack, $needle, $offset);
+
+	    }
+
+	    $needle = (string) $needle;
+
+	    if ('' === $needle) {
+
+	        return false;
+
+	    }
+
+	    return iconv_strpos($haystack, $needle, $offset, $encoding);
+
+	}
+
 }
\ No newline at end of file

From c91b7af619ff7924c2d00e793eda587dbb736107 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 4 Feb 2020 09:51:02 -0500
Subject: [PATCH 037/123] Removing mb_substr

---
 .../Compat/Random/byte_safe_strings.php       |  4 +-
 .../Service/Encrypt/Encrypt.php               |  6 +-
 .../Service/Formatter/Formats/Text.php        | 11 ++-
 system/ee/legacy/helpers/multibyte_helper.php | 75 +++++++++++++++----
 system/ee/legacy/libraries/Encrypt.php        |  7 +-
 5 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
index cfd05d1f44..c4ee616ccb 100755
--- a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
@@ -136,7 +136,9 @@ function RandomCompat_substr($binary_string, $start, $length = null)
                 return '';
             }
 
-            return (string) mb_substr($binary_string, $start, $length, '8bit');
+            ee()->load->helper('multibyte');
+
+            return (string) ee_mb_substr($binary_string, $start, $length, '8bit');
         }
 
     } else {
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php b/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
index c9ee734cdf..d73b75715f 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Encrypt/Encrypt.php
@@ -114,11 +114,9 @@ public function decrypt($data, $key = '')
 
 		$iv_size = openssl_cipher_iv_length($this->method);
 
-		$iv = ($this->mb_available) ? mb_substr($data, 0, $iv_size, 'ascii') : substr($data, 0, $iv_size);
+		$iv = ee_mb_substr($data, 0, $iv_size, 'ascii');
 		
-		$data = ($this->mb_available)
-					? mb_substr($data, $iv_size, ee_mb_strlen($data, 'ascii'), 'ascii')
-					: substr($data, $iv_size);
+		$data = ee_mb_substr($data, $iv_size, ee_mb_strlen($data, 'ascii'), 'ascii');
 
 		return openssl_decrypt($data, $this->method, $key, $this->options, $iv);
 	}
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
index 957d3ee336..6c5f8fb3fe 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Formatter/Formats/Text.php
@@ -459,15 +459,14 @@ public function limitChars($options = [])
 			// characters may affect where the wrap occurs
 			$this->content = wordwrap($this->content, $limit, "\n", true);
 
-			$cut = ($this->multibyte)
-				? mb_substr($this->content, 0, ee_mb_strpos($this->content, "\n"), 'utf8')
-				: substr($this->content, 0, strpos($this->content, "\n"));
+			$cut = ee_mb_substr($this->content, 0, ee_mb_strpos($this->content, "\n"), 'utf8');
+
 		}
 		else
 		{
-			$cut = ($this->multibyte)
-				? mb_substr($this->content, 0, $limit, 'utf8')
-				: substr($this->content, 0, $limit);
+
+			$cut = ee_mb_substr($this->content, 0, $limit, 'utf8');
+
 		}
 
 		$this->content = (strlen($cut) == strlen($this->content)) ? $cut : $cut.$end_char;
diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index a87220cb50..996792a132 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -20,13 +20,13 @@ function ee_get_encoding($encoding)
 
 		if (null === $encoding) {
 
-		    return ee()->config->item('charset') ?: 'utf8';
+			return ee()->config->item('charset') ?: 'utf8';
 
 		}
 
 		if ('UTF-8' === $encoding) {
 
-		    return 'UTF-8';
+			return 'UTF-8';
 
 		}
 
@@ -34,13 +34,13 @@ function ee_get_encoding($encoding)
 
 		if ( '8BIT' === $encoding || 'BINARY' === $encoding ) {
 
-		    return 'CP850';
+			return 'CP850';
 
 		}
 
 		if ( 'UTF8' === $encoding ) {
 
-		    return 'UTF-8';
+			return 'UTF-8';
 
 		}
 
@@ -116,23 +116,72 @@ function ee_mb_strlen( $str, $encoding = null ) {
 
 	function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 	{
-	    $encoding = ee_get_encoding($encoding);
+		$encoding = ee_get_encoding($encoding);
 
-	    if ('CP850' === $encoding || 'ASCII' === $encoding) {
+		if ('CP850' === $encoding || 'ASCII' === $encoding) {
 
-	        return strpos($haystack, $needle, $offset);
+			return strpos($haystack, $needle, $offset);
 
-	    }
+		}
+
+		$needle = (string) $needle;
+
+		if ('' === $needle) {
+
+			return false;
+
+		}
+
+		return iconv_strpos($haystack, $needle, $offset, $encoding);
+
+	}
+
+}
+
+if( ! function_exists( 'ee_mb_substr ') ) {
+
+	function ee_mb_substr($s, $start, $length = null, $encoding = null)
+	{
+		$encoding = ee_get_encoding($encoding);
+
+		if ('CP850' === $encoding || 'ASCII' === $encoding) {
+
+			return (string) substr($s, $start, null === $length ? 2147483647 : $length);
 
-	    $needle = (string) $needle;
 
-	    if ('' === $needle) {
+		}
+
+		if ($start < 0) {
+
+			$start = iconv_strlen($s, $encoding) + $start;
+
+			if ($start < 0) {
+
+				$start = 0;
+
+			}
+
+		}
 
-	        return false;
+		if (null === $length) {
 
-	    }
+			$length = 2147483647;
+
+		}
+		elseif ($length < 0)
+		{
+
+			$length = iconv_strlen($s, $encoding) + $length - $start;
+
+			if ($length < 0) {
+
+				return '';
+
+			}
+
+		}
 
-	    return iconv_strpos($haystack, $needle, $offset, $encoding);
+		return (string) iconv_substr($s, $start, $length, $encoding);
 
 	}
 
diff --git a/system/ee/legacy/libraries/Encrypt.php b/system/ee/legacy/libraries/Encrypt.php
index 0a15c297da..817161f7d3 100644
--- a/system/ee/legacy/libraries/Encrypt.php
+++ b/system/ee/legacy/libraries/Encrypt.php
@@ -287,9 +287,12 @@ function mcrypt_decode($data, $key)
 			return FALSE;
 		}
 
-		$init_vect = ($this->mb_available) ? mb_substr($data, 0, $init_size, 'ascii') : substr($data, 0, $init_size);
-		$data = ($this->mb_available) ? mb_substr($data, $init_size, mb_strlen($data, 'ascii'), 'ascii') : substr($data, $init_size);
+		$init_vect = ee_mb_substr($data, 0, $init_size, 'ascii');
+
+		$data = ee_mb_substr($data, $init_size, ee_mb_strlen($data, 'ascii'), 'ascii');
+
 		return rtrim(mcrypt_decrypt($this->_get_cipher(), $key, $data, $this->_get_mode(), $init_vect), "\0");
+
 	}
 
 	/**

From 56d7cdde42538287a5eac848f8a100a92a14a05a Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 4 Feb 2020 10:01:32 -0500
Subject: [PATCH 038/123] Whitespace

---
 system/ee/legacy/helpers/multibyte_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index 996792a132..c451ad072f 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -185,4 +185,5 @@ function ee_mb_substr($s, $start, $length = null, $encoding = null)
 
 	}
 
-}
\ No newline at end of file
+}
+

From bb9533617ebc6179d2721177a746ee6e05368282 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 4 Feb 2020 16:25:00 -0500
Subject: [PATCH 039/123] Fixing namespace

---
 .../Service/Model/Column/{Object => ColumnObject}/Timestamp.php   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename system/ee/EllisLab/ExpressionEngine/Service/Model/Column/{Object => ColumnObject}/Timestamp.php (100%)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php b/system/ee/EllisLab/ExpressionEngine/Service/Model/Column/ColumnObject/Timestamp.php
similarity index 100%
rename from system/ee/EllisLab/ExpressionEngine/Service/Model/Column/Object/Timestamp.php
rename to system/ee/EllisLab/ExpressionEngine/Service/Model/Column/ColumnObject/Timestamp.php

From 264925aa41556a4e2ffcdfacff48106033b32107 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 5 Feb 2020 14:03:51 -0500
Subject: [PATCH 040/123] Casting opacity

---
 system/ee/legacy/libraries/Image_lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Image_lib.php b/system/ee/legacy/libraries/Image_lib.php
index 7398e6d5ed..d5cc947508 100644
--- a/system/ee/legacy/libraries/Image_lib.php
+++ b/system/ee/legacy/libraries/Image_lib.php
@@ -1008,7 +1008,7 @@ function overlay_watermark()
 		{
 			// set our RGB value from above to be transparent and merge the images with the specified opacity
 			imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp));
-			imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);
+			imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, (int) $this->wm_opacity);
 		}
 
 		//  Output the image

From 4fda34d73ba1d908a0620a53e4b2d840faebba11 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 6 Feb 2020 07:01:26 -0500
Subject: [PATCH 041/123] Changing numeric validator for soft reserved keyword

---
 .../Validation/Rule/{Numeric.php => ValidateNumeric.php}     | 2 +-
 .../ExpressionEngine/Service/Validation/Validator.php        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/{Numeric.php => ValidateNumeric.php} (93%)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/Numeric.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ValidateNumeric.php
similarity index 93%
rename from system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/Numeric.php
rename to system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ValidateNumeric.php
index 89baabc3bc..27327eaa8f 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/Numeric.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ValidateNumeric.php
@@ -15,7 +15,7 @@
 /**
  * Numeric Validation Rule
  */
-class Numeric extends ValidationRule {
+class ValidateNumeric extends ValidationRule {
 
 	public function validate($key, $value)
 	{
diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Validator.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Validator.php
index 5b209a5bb2..3682800553 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Validator.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Validator.php
@@ -332,6 +332,11 @@ protected function newValidationRule($rule_name)
 	{
 		$rule_class = implode('', array_map('ucfirst', explode('_', $rule_name)));
 
+		// Fix for Numeric class
+		if($rule_class == 'Numeric') {
+			$rule_class = 'ValidateNumeric';
+		}
+
 		$class = __NAMESPACE__."\\Rule\\{$rule_class}";
 
 		if (class_exists($class))

From b7d856f68c7061ac34cec9b25a075bb0825db97d Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 6 Feb 2020 07:01:43 -0500
Subject: [PATCH 042/123] Removing mcrypt

---
 .../Library/Compat/Random/random.php          | 36 ---------
 .../Compat/Random/random_bytes_mcrypt.php     | 77 -------------------
 2 files changed, 113 deletions(-)
 delete mode 100755 system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random_bytes_mcrypt.php

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random.php b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random.php
index df74c8a4b6..da97e2921e 100755
--- a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random.php
@@ -125,42 +125,6 @@
         $RandomCompatUrandom = false;
     }
 
-    /**
-     * mcrypt_create_iv()
-     *
-     * We only want to use mcypt_create_iv() if:
-     *
-     * - random_bytes() hasn't already been defined
-     * - the mcrypt extensions is loaded
-     * - One of these two conditions is true:
-     *   - We're on Windows (DIRECTORY_SEPARATOR !== '/')
-     *   - We're not on Windows and /dev/urandom is readabale
-     *     (i.e. we're not in a chroot jail)
-     * - Special case:
-     *   - If we're not on Windows, but the PHP version is between
-     *     5.6.10 and 5.6.12, we don't want to use mcrypt. It will
-     *     hang indefinitely. This is bad.
-     *   - If we're on Windows, we want to use PHP >= 5.3.7 or else
-     *     we get insufficient entropy errors.
-     */
-    if (
-        !is_callable('random_bytes')
-        &&
-        // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
-        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
-        &&
-        // Prevent this code from hanging indefinitely on non-Windows;
-        // see https://bugs.php.net/bug.php?id=69833
-        (
-            DIRECTORY_SEPARATOR !== '/' ||
-            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
-        )
-        &&
-        extension_loaded('mcrypt')
-    ) {
-        // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
-    }
     $RandomCompatUrandom = null;
 
     /**
diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random_bytes_mcrypt.php b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random_bytes_mcrypt.php
deleted file mode 100755
index aac9c013d4..0000000000
--- a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/random_bytes_mcrypt.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library 
- * for using the new PHP 7 random_* API in PHP 5 projects
- * 
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
-     *
-     * @ref https://bugs.php.net/bug.php?id=55169
-     * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
-        if (
-            $buf !== false
-            &&
-            RandomCompat_strlen($buf) === $bytes
-        ) {
-            /**
-             * Return our random entropy buffer here:
-             */
-            return $buf;
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}

From 55df67c6343e9b1c682d7b48a49e224bc0d2790f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 11:40:48 -0500
Subject: [PATCH 043/123] Removing deprecated each

---
 system/ee/legacy/libraries/Xmlrpc.php | 71 ++++++++++++++++++---------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/system/ee/legacy/libraries/Xmlrpc.php b/system/ee/legacy/libraries/Xmlrpc.php
index 985e876177..788858e5e5 100644
--- a/system/ee/legacy/libraries/Xmlrpc.php
+++ b/system/ee/legacy/libraries/Xmlrpc.php
@@ -231,9 +231,11 @@ function values_parsing($value, $return = FALSE)
 			}
 			elseif(is_array($value['0']) && ($value['1'] == 'struct' OR $value['1'] == 'array'))
 			{
-				while (list($k) = each($value['0']))
-				{
+
+				foreach ($value[0] as $k) {
+
 					$value['0'][$k] = $this->values_parsing($value['0'][$k], TRUE);
+
 				}
 
 				$temp = new XML_RPC_Values($value['0'], $value['1']);
@@ -482,8 +484,8 @@ function decode($array=FALSE)
 	{
 		if ($array !== FALSE && is_array($array))
 		{
-			while (list($key) = each($array))
-			{
+
+			foreach ($array as $key) {
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->decode($array[$key]);
@@ -530,28 +532,38 @@ function xmlrpc_decoder($xmlrpc_val)
 		elseif($kind == 'array')
 		{
 			reset($xmlrpc_val->me);
-			list($a,$b) = each($xmlrpc_val->me);
-			$size = count($b);
 
-			$arr = array();
+			foreach ($xmlrpc_val->me as $b) {
 
-			for($i = 0; $i < $size; $i++)
-			{
-				$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
+				$size = count($b);
+
+				$arr = array();
+
+				for($i = 0; $i < $size; $i++)
+				{
+					$arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]);
+				}
+
+				return $arr;
+				
 			}
-			return $arr;
+
 		}
 		elseif($kind == 'struct')
 		{
 			reset($xmlrpc_val->me['struct']);
 			$arr = array();
 
-			while(list($key,$value) = each($xmlrpc_val->me['struct']))
-			{
+			foreach ($xmlrpc_val->me['struct'] as $key => $value) {
+
 				$arr[$key] = $this->xmlrpc_decoder($value);
+
 			}
+			
 			return $arr;
+
 		}
+
 	}
 
 
@@ -1096,8 +1108,9 @@ function output_parameters($array=FALSE)
 	{
 		if ($array !== FALSE && is_array($array))
 		{
-			while (list($key) = each($array))
-			{
+
+			foreach ($array as $key) {
+
 				if (is_array($array[$key]))
 				{
 					$array[$key] = $this->output_parameters($array[$key]);
@@ -1111,6 +1124,7 @@ function output_parameters($array=FALSE)
 			}
 
 			$parameters = $array;
+
 		}
 		else
 		{
@@ -1146,7 +1160,8 @@ function decode_message($param)
 		elseif($kind == 'array')
 		{
 			reset($param->me);
-			list($a,$b) = each($param->me);
+
+			$b = array_values($param->me);
 
 			$arr = array();
 
@@ -1163,13 +1178,16 @@ function decode_message($param)
 
 			$arr = array();
 
-			while(list($key,$value) = each($param->me['struct']))
-			{
+			foreach ($param->me['struct'] as $key => $value) {
+
 				$arr[$key] = $this->decode_message($value);
+
 			}
 
 			return $arr;
+
 		}
+
 	}
 
 }
@@ -1303,8 +1321,8 @@ function serializedata($typ, $val)
 				// struct
 				$rs .= "<struct>\n";
 				reset($val);
-				while(list($key2, $val2) = each($val))
-				{
+
+				foreach ($val as $key2 => $value2) {
 					$rs .= "<member>\n<name>{$key2}</name>\n";
 					$rs .= $this->serializeval($val2);
 					$rs .= "</member>\n";
@@ -1353,16 +1371,21 @@ function serializeval($o)
 		$ar = $o->me;
 		reset($ar);
 
-		list($typ, $val) = each($ar);
-		$rs = "<value>\n".$this->serializedata($typ, $val)."</value>\n";
+		$rs = '';
+
+		foreach ($ar as $typ => $val) {
+			$rs .= "<value>\n".$this->serializedata($typ, $val)."</value>\n";
+		}
+
 		return $rs;
+
 	}
 
 	function scalarval()
 	{
 		reset($this->me);
-		list($a,$b) = each($this->me);
-		return $b;
+
+		return is_array($this->me) ? $this->me[0] : false;
 	}
 
 

From ca8983eff7b93b5982ef36ebbca7828403f103b1 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:44:49 -0500
Subject: [PATCH 044/123] Removing deprecated each functions

---
 system/ee/legacy/libraries/Xmlrpcs.php | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/system/ee/legacy/libraries/Xmlrpcs.php b/system/ee/legacy/libraries/Xmlrpcs.php
index 3539776616..992b2d261a 100644
--- a/system/ee/legacy/libraries/Xmlrpcs.php
+++ b/system/ee/legacy/libraries/Xmlrpcs.php
@@ -495,24 +495,44 @@ function multicall_error($err)
 
 	function do_multicall($call)
 	{
-		if ($call->kindOf() != 'struct')
+		if ($call->kindOf() != 'struct'){
+
 			return $this->multicall_error('notstruct');
+		}
 		elseif ( ! $methName = $call->me['struct']['methodName'])
+		{
 			return $this->multicall_error('nomethod');
+		}
 
-		list($scalar_type,$scalar_value)=each($methName->me);
+		$tempArray = $methName->me;
+
+		$scalar_type = key($tempArray);
+		$scalar_value = current($tempArray);
+		
 		$scalar_type = $scalar_type == $this->xmlrpcI4 ? $this->xmlrpcInt : $scalar_type;
 
 		if ($methName->kindOf() != 'scalar' OR $scalar_type != 'string')
+		{
 			return $this->multicall_error('notstring');
+		}
 		elseif ($scalar_value == 'system.multicall')
+		{
 			return $this->multicall_error('recursion');
+		}
 		elseif ( ! $params = $call->me['struct']['params'])
+		{
 			return $this->multicall_error('noparams');
+		}
 		elseif ($params->kindOf() != 'array')
+		{
 			return $this->multicall_error('notarray');
+		}
+
+		$tempArray = $params->me;
+
+		$a = key($tempArray);
+		$b = current($tempArray);
 
-		list($a,$b)=each($params->me);
 		$numParams = count($b);
 
 		$msg = new XML_RPC_Message($scalar_value);

From ad41b93cef22f70c217369e0324e9398b7b825a5 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:45:03 -0500
Subject: [PATCH 045/123] Fixing deprecated bracket array issues

---
 .../libraries/simplepie/idn/idna_convert.class.php       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
index eb9d5f516e..408fd2b46b 100755
--- a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
+++ b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
@@ -374,7 +374,7 @@ function _decode($encoded)
         $delim_pos = strrpos($encoded, '-');
         if ($delim_pos > strlen($this->_punycode_prefix)) {
             for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
-                $decoded[] = ord($encoded{$k});
+                $decoded[] = ord($encoded[$k]);
             }
         } else {
             $decoded = array();
@@ -390,7 +390,8 @@ function _decode($encoded)
 
         for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
             for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
-                $digit = $this->_decode_digit($encoded{$enco_idx++});
+                $enco_idx++;
+                $digit = $this->_decode_digit($encoded[$enco_idx]);
                 $idx += $digit * $w;
                 $t = ($k <= $bias) ? $this->_tmin :
                         (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
@@ -793,7 +794,7 @@ function _utf8_to_ucs4($input)
         $mode = 'next';
         $test = 'none';
         for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input{$k}); // Extract byte from input string
+            $v = ord($input[$k]); // Extract byte from input string
 
             if ($v < 128) { // We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
@@ -932,7 +933,7 @@ function _ucs4_string_to_ucs4($input)
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input[$i]) << (8 * (3 - ($i % 4) ) );
         }
         return $output;
     }

From b7f815455b0c1526e262fa3d0d607a7b52104576 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:48:55 -0500
Subject: [PATCH 046/123] More curly bracket arrays

---
 .../typography/Markdown/Michelf/Markdown.php  | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
index 68bb5587e1..59db13d5f4 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
@@ -797,7 +797,7 @@ protected function _doHeaders_callback_setext($matches) {
 		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
 			return $matches[0];
 		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$level = $matches[2][0] == '=' ? 1 : 2;
 
 		# id attribute generation
 		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
@@ -1137,7 +1137,7 @@ protected function doItalicsAndBold($text) {
 				} else {
 					# Other closing marker: close one em or strong and
 					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$token_stack[0] = str_repeat($token[0], 3-$token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
@@ -1162,7 +1162,7 @@ protected function doItalicsAndBold($text) {
 				} else {
 					# Reached opening three-char emphasis marker. Push on token 
 					# stack; will be handled by the special condition above.
-					$em = $token{0};
+					$em = $token[0];
 					$strong = "$em$em";
 					array_unshift($token_stack, $token);
 					array_unshift($text_stack, '');
@@ -1527,9 +1527,9 @@ protected function handleSpanToken($token, &$str) {
 	# Handle $token provided by parseSpan by determining its nature and 
 	# returning the corresponding value that should replace it.
 	#
-		switch ($token{0}) {
+		switch ($token[0]) {
 			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
+				return $this->hashPart("&#". ord($token[1]). ";");
 			case "`":
 				# Search for end marker in remaining text.
 				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
@@ -1588,6 +1588,7 @@ protected function _detab_callback($matches) {
 		}
 		return $line;
 	}
+
 	protected function _initDetab() {
 	#
 	# Check for the availability of the function in the `utf8_strlen` property
@@ -1596,12 +1597,15 @@ protected function _initDetab() {
 	# regular expression.
 	#
 		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
-			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
-			$text, $m);');
+		$this->utf8_strlen = function($text) {
+			return preg_match_all(
+				"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
+				$text,
+				$m
+			);
+		};
 	}
 
-
 	protected function unhash($text) {
 	#
 	# Swap back in all the tags hashed by _HashHTMLBlocks.

From 19052c1a19ae33c91dd8020ee3fbb2158d994ac8 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:52:53 -0500
Subject: [PATCH 047/123] Fixing indirect variable setting

---
 system/ee/legacy/libraries/Xmlrpcs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Xmlrpcs.php b/system/ee/legacy/libraries/Xmlrpcs.php
index 992b2d261a..00c20e38cf 100644
--- a/system/ee/legacy/libraries/Xmlrpcs.php
+++ b/system/ee/legacy/libraries/Xmlrpcs.php
@@ -333,7 +333,7 @@ function _execute($m)
 			{
 				if ($this->object === FALSE)
 				{
-					return ee()->$method_parts['1']($m);
+					return ee()->{$method_parts['1']}($m);
 				}
 				else
 				{

From f8c3502a21dd08c1eea220ba04e88e9d90ee6d39 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:56:13 -0500
Subject: [PATCH 048/123] Removing deprecated mysql function

---
 system/ee/installer/libraries/Survey.php      |  3 +--
 .../Markdown/Michelf/MarkdownExtra.php        | 26 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/system/ee/installer/libraries/Survey.php b/system/ee/installer/libraries/Survey.php
index fb97336a32..13341ed75d 100644
--- a/system/ee/installer/libraries/Survey.php
+++ b/system/ee/installer/libraries/Survey.php
@@ -44,8 +44,7 @@ function fetch_anon_server_data()
 		// Get a list of add-ons in their third_party folder
 		ee()->load->helper('directory');
 
-		$mysql_info = (ee()->db->dbdriver == 'mysqli')
-			? mysqli_get_server_info(ee()->db->conn_id) : mysql_get_server_info();
+		$mysql_info = mysqli_get_server_info(ee()->db->conn_id);
 
 		return array(
 			'anon_id'			=> md5($site_url),
diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
index 1bab3d2a10..d27cb62116 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
@@ -160,9 +160,9 @@ protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $
 		$attributes = array();
 		$id = false;
 		foreach ($elements as $element) {
-			if ($element{0} == '.') {
+			if ($element[0] == '.') {
 				$classes[] = substr($element, 1);
-			} else if ($element{0} == '#') {
+			} else if ($element[0] == '#') {
 				if ($id === false) $id = substr($element, 1);
 			} else if (strpos($element, '=') > 0) {
 				$parts = explode('=', $element, 2);
@@ -431,7 +431,7 @@ protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
 			#
 			# Check for: Indented code block.
 			#
-			else if ($tag{0} == "\n" || $tag{0} == " ") {
+			else if ($tag[0] == "\n" || $tag[0] == " ") {
 				# Indented code block: pass it unchanged, will be handled 
 				# later.
 				$parsed .= $tag;
@@ -440,7 +440,7 @@ protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
 			# Check for: Code span marker
 			# Note: need to check this after backtick fenced code blocks
 			#
-			else if ($tag{0} == "`") {
+			else if ($tag[0] == "`") {
 				# Find corresponding end marker.
 				$tag_re = preg_quote($tag);
 				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
@@ -478,7 +478,7 @@ protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
 			#            HTML Comments, processing instructions.
 			#
 			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
+				$tag[1] == '!' || $tag[1] == '?')
 			{
 				# Need to parse tag and following text using the HTML parser.
 				# (don't check for markdown attribute)
@@ -497,8 +497,8 @@ protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
 				#
 				# Increase/decrease nested tag count.
 				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				if ($tag[1] == '/')						$depth--;
+				else if ($tag[strlen($tag)-2] != '/')	$depth++;
 
 				if ($depth < 0) {
 					#
@@ -602,7 +602,7 @@ protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 				# first character as filtered to prevent an infinite loop in the 
 				# parent function.
 				#
-				return array($original_text{0}, substr($original_text, 1));
+				return array($original_text[0], substr($original_text, 1));
 			}
 			
 			$block_text .= $parts[0]; # Text before current tag.
@@ -614,7 +614,7 @@ protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 			#			 Comments and Processing Instructions.
 			#
 			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
+				$tag[1] == '!' || $tag[1] == '?')
 			{
 				# Just add the tag to the block as if it was text.
 				$block_text .= $tag;
@@ -625,8 +625,8 @@ protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 				# the tag's name match base tag's.
 				#
 				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					if ($tag[1] == '/')						$depth--;
+					else if ($tag[strlen($tag)-2] != '/')	$depth++;
 				}
 				
 				#
@@ -990,7 +990,7 @@ protected function _doHeaders_callback_setext($matches) {
 		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
 			return $matches[0];
 
-		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$level = $matches[3][0] == '=' ? 1 : 2;
 
 		$defaultId = is_callable($this->header_id_func) ? call_user_func($this->header_id_func, $matches[1]) : null;
 
@@ -1334,7 +1334,7 @@ protected function _doFencedCodeBlocks_callback($matches) {
 
 		$classes = array();
 		if ($classname != "") {
-			if ($classname{0} == '.')
+			if ($classname[0] == '.')
 				$classname = substr($classname, 1);
 			$classes[] = $this->code_class_prefix.$classname;
 		}

From 7acae08eef16572997b8806fa7fac5a47c986b86 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 7 Feb 2020 12:59:52 -0500
Subject: [PATCH 049/123] Changelog

---
 changelogs/minor.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index dee6b3d4ad..a6821684c4 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -4,9 +4,8 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 ## Minor Release
 
-Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+- Adds support for PHP7.4
+- Removes deprecated function, bringing true minimum version to 5.6
 
 
 

From 001cf85215ae1f787280157c949ce0de6513a6ea Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 13 Feb 2020 11:36:25 -0500
Subject: [PATCH 050/123] Fixing magic quotes

---
 .../Addons/simple_commerce/mod.simple_commerce.php | 14 +++++++++++---
 system/ee/legacy/core/Input.php                    |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php b/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
index a87f32609a..57f5d44b6d 100644
--- a/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
+++ b/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
@@ -560,11 +560,15 @@ function curl_process($url)
 			// put line feeds back to CR+LF as that's how PayPal sends them out
 			// otherwise multi-line data will be rejected as INVALID
 			// Note: get_magic_quotes_gpc FALSE as of PHP 5.4.0
-			$stripped = (get_magic_quotes_gpc()) ? stripslashes(str_replace("\n", "\r\n", $value)) : str_replace("\n", "\r\n", $value);
+			$stripped = (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
+							? stripslashes(str_replace("\n", "\r\n", $value))
+							: str_replace("\n", "\r\n", $value);
+
 			$postdata .= "&$key=".urlencode($stripped);
+
 		}
 
-		$ch=curl_init();
+		$ch = curl_init();
 		curl_setopt($ch,CURLOPT_SSL_VERIFYPEER,FALSE);
 		curl_setopt($ch,CURLOPT_URL,$url);
 		curl_setopt($ch,CURLOPT_POST,1);
@@ -612,8 +616,12 @@ function fsockopen_process($url)
 			// put line feeds back to CR+LF as that's how PayPal sends them out
 			// otherwise multi-line data will be rejected as INVALID
 			// Note: get_magic_quotes_gpc FALSE as of PHP 5.4.0
-			$stripped = (get_magic_quotes_gpc()) ? stripslashes(str_replace("\n", "\r\n", $value)) : str_replace("\n", "\r\n", $value);
+			$stripped = (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
+							? stripslashes(str_replace("\n", "\r\n", $value))
+							: str_replace("\n", "\r\n", $value);
+
 			$postdata .= "&$key=".urlencode($stripped);
+
 		}
 
 		$info = '';
diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
index 06ea004809..e4c9d4e296 100644
--- a/system/ee/legacy/core/Input.php
+++ b/system/ee/legacy/core/Input.php
@@ -967,7 +967,7 @@ function _clean_input_data($str)
 		}
 
 		// We strip slashes if magic quotes is on to keep things consistent
-		if (get_magic_quotes_gpc())
+		if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
 		{
 			$str = stripslashes($str);
 		}

From 51ac6318a9310aa465608cd6f79290bdcba697ff Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 13 Feb 2020 13:56:30 -0500
Subject: [PATCH 051/123] Resolves #363

---
 system/ee/legacy/libraries/Typography.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Typography.php b/system/ee/legacy/libraries/Typography.php
index eef01d62af..328df199cc 100644
--- a/system/ee/legacy/libraries/Typography.php
+++ b/system/ee/legacy/libraries/Typography.php
@@ -2597,7 +2597,7 @@ public function decodeIDN($url)
 		{
 			if (is_php('7.2'))
 			{
-				$parts['host'] = idn_to_ascii($parts['host'], 0, INTL_IDNA_VARIANT_UTS46);
+				$parts['host'] = idn_to_ascii($parts['host'], 0, defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : 0);
 			}
 			else
 			{

From 709fc097c2fb9e4d6e16585790968c94dcc3827f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 18 Feb 2020 13:21:06 -0500
Subject: [PATCH 052/123] Fixing folder creation error

---
 eetools | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eetools b/eetools
index e0bce70dd7..f48ab496f7 100755
--- a/eetools
+++ b/eetools
@@ -9,7 +9,7 @@ git archive --format=tar -o ee.tar $STASH_NAME
 # Absolutely have to have the git folder available in the archive?
 #tar --append --file=ee.tar .git
 
-IMAGE_NAME="ellislab/eecms-test:old"
+IMAGE_NAME="eecms_test:latest"
 VOLUME_ID=`docker volume create`
 HELPER_CONTAINER_ID=`docker create -v $VOLUME_ID:/app $IMAGE_NAME /bin/true`
 
@@ -48,7 +48,9 @@ else
 
 	((STATUS+=$?))
 
-	mkdir /tmp/artifacts > /dev/null
+	if [ ! -d /tmp/artifacts ]; then
+		mkdir /tmp/artifacts > /dev/null
+	fi
 	docker cp $HELPER_CONTAINER_ID:/app/artifacts/. /tmp/artifacts
 fi
 

From 7bb8884cdb0979f37b1cd48a300026a89ce921cb Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 18 Feb 2020 14:01:39 -0500
Subject: [PATCH 053/123] Stripping magic quotes

---
 .../Addons/simple_commerce/mod.simple_commerce.php  | 13 +++----------
 system/ee/legacy/core/Input.php                     |  6 ------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php b/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
index 57f5d44b6d..e6237fb5c7 100644
--- a/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
+++ b/system/ee/EllisLab/Addons/simple_commerce/mod.simple_commerce.php
@@ -556,13 +556,8 @@ function curl_process($url)
 
 		foreach ($_POST as $key => $value)
 		{
-			// str_replace("\n", "\r\n", $value)
-			// put line feeds back to CR+LF as that's how PayPal sends them out
-			// otherwise multi-line data will be rejected as INVALID
-			// Note: get_magic_quotes_gpc FALSE as of PHP 5.4.0
-			$stripped = (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
-							? stripslashes(str_replace("\n", "\r\n", $value))
-							: str_replace("\n", "\r\n", $value);
+
+			$stripped = str_replace("\n", "\r\n", $value);
 
 			$postdata .= "&$key=".urlencode($stripped);
 
@@ -616,9 +611,7 @@ function fsockopen_process($url)
 			// put line feeds back to CR+LF as that's how PayPal sends them out
 			// otherwise multi-line data will be rejected as INVALID
 			// Note: get_magic_quotes_gpc FALSE as of PHP 5.4.0
-			$stripped = (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
-							? stripslashes(str_replace("\n", "\r\n", $value))
-							: str_replace("\n", "\r\n", $value);
+			$stripped = str_replace("\n", "\r\n", $value);
 
 			$postdata .= "&$key=".urlencode($stripped);
 
diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
index e4c9d4e296..14ca8d11d6 100644
--- a/system/ee/legacy/core/Input.php
+++ b/system/ee/legacy/core/Input.php
@@ -966,12 +966,6 @@ function _clean_input_data($str)
 			return $new_array;
 		}
 
-		// We strip slashes if magic quotes is on to keep things consistent
-		if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
-		{
-			$str = stripslashes($str);
-		}
-
 		// Clean UTF-8 if supported
 		if (UTF8_ENABLED === TRUE)
 		{

From 09f6796e7190c3b8b8defa3fa77fd37982b66dff Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 18 Feb 2020 14:01:55 -0500
Subject: [PATCH 054/123] Fixing duplicate folder error

---
 tests/docker/runtests.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/docker/runtests.sh b/tests/docker/runtests.sh
index 896d290581..da1e74760b 100644
--- a/tests/docker/runtests.sh
+++ b/tests/docker/runtests.sh
@@ -15,7 +15,7 @@ function load_php_version {
 
 	source ~/.phpbrew/bashrc
 	echo "Loading PHP ${PHP_VERSION} ..."
-	phpbrew use php-$PHP_VERSION
+	phpbrew use $PHP_VERSION
 	# Prevent other PHPs from loading
 	echo "" > /etc/apache2/mods-available/php5.load
 	echo "" > /etc/apache2/mods-available/php7.load
@@ -28,7 +28,7 @@ while [[ $# > 0 ]]
 	key="$1"
 
 	# Default PHP version
-	PHP_VERSION="7.1.11"
+	PHP_VERSION="7.4.1"
 
 	case $key in
 		-p|--php)
@@ -70,7 +70,9 @@ function setup_permissions {
 }
 
 ARTIFACTS_DIR="/app/artifacts/${PHP_VERSION}"
-mkdir -p $ARTIFACTS_DIR
+if [ ! -d $ARTIFACTS_DIR ]; then
+	mkdir -p $ARTIFACTS_DIR;
+fi
 
 function start_apache_mysql {
 	# https://github.com/docker/for-linux/issues/72

From 2e31c7a10e856811e4208f46d67c1d699fe2ff63 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 26 Feb 2020 05:40:42 -0500
Subject: [PATCH 055/123] Fixing mb_strlen polyfill

---
 system/ee/legacy/helpers/multibyte_helper.php | 47 ++-----------------
 1 file changed, 5 insertions(+), 42 deletions(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index c451ad072f..786f8456a0 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -61,53 +61,16 @@ function ee_get_encoding($encoding)
 
 	function ee_mb_strlen( $str, $encoding = null ) {
 
-		if ( null === $encoding ) {
-
-			$encoding = ee()->config->item('charset') ?: 'utf8';
-
-		}
+		$encoding = ee_get_encoding($encoding);
 
-		// If standard encoding, strlen works just fine
-		if ( ! in_array( strtolower($encoding), array( 'utf8', 'utf-8' ) ) ) {
+		if ('CP850' === $encoding || 'ASCII' === $encoding) {
 
-			return strlen( $str );
+			return \strlen($s);
 
 		}
 
-		// Check byte count
-		$regex = '/(?:
-			[\x00-\x7F]                  # single-byte sequences   0xxxxxxx
-			| [\xC2-\xDF][\x80-\xBF]       # double-byte sequences   110xxxxx 10xxxxxx
-			| \xE0[\xA0-\xBF][\x80-\xBF]   # triple-byte sequences   1110xxxx 10xxxxxx * 2
-			| [\xE1-\xEC][\x80-\xBF]{2}
-			| \xED[\x80-\x9F][\x80-\xBF]
-			| [\xEE-\xEF][\x80-\xBF]{2}
-			| \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
-			| [\xF1-\xF3][\x80-\xBF]{3}
-			| \xF4[\x80-\x8F][\x80-\xBF]{2}
-		)/x';
-
-		// Start at 1 instead of 0 since the first thing we do is decrement.
-		$count = 1;
-
-		do {
-			// We had some string left over from the last round, but we counted it in that last round.
-			$count--;
-
-			/*
-			 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
-			 * the rest of the string).
-			 */
-			$pieces = preg_split( $regex, $str, 1000 );
-
-			// Increment.
-			$count += count( $pieces );
-
-			// If there's anything left over, repeat the loop.
-		} while ( $str = array_pop( $pieces ) );
-
-		// Fencepost: preg_split() always returns one extra item in the array.
-		return --$count;
+		return @iconv_strlen($s, $encoding);
+
 	}
 
 }

From 4415ab0d5149dbc7f498be02c316f12f120ef289 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 26 Feb 2020 19:41:41 -0500
Subject: [PATCH 056/123] Fixing variable

---
 system/ee/legacy/helpers/multibyte_helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index 786f8456a0..8f90a98727 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -65,11 +65,11 @@ function ee_mb_strlen( $str, $encoding = null ) {
 
 		if ('CP850' === $encoding || 'ASCII' === $encoding) {
 
-			return \strlen($s);
+			return strlen($str);
 
 		}
 
-		return @iconv_strlen($s, $encoding);
+		return @iconv_strlen($str, $encoding);
 
 	}
 

From 59c011d23a4b29123256bba255658c50e1ed1485 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 27 Feb 2020 09:47:56 -0500
Subject: [PATCH 057/123] Fixing validation error

---
 .../ExpressionEngine/Service/Validation/Rule/MaxLength.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
index cce1c3bc98..2fbe88b4ba 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
@@ -31,7 +31,7 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		return (ee_mb_strlen($value) < $length) ? FALSE : TRUE;
+		return (ee_mb_strlen($value) < $length) ? true : false;
 
 	}
 

From f7a8c758df76fe7804e2ce4df5530de5104d4fff Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 27 Feb 2020 13:04:07 -0500
Subject: [PATCH 058/123] Docblocking

---
 system/ee/legacy/helpers/multibyte_helper.php | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index 8f90a98727..6ae9c18b18 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -13,8 +13,14 @@
  * Multibyte Helpers
  */
 
+/**
+ * gets encoding by string
+ * @param  string $encoding
+ * @return string
+ */
 if ( ! function_exists( 'ee_get_encoding' ) )
 {
+
 	function ee_get_encoding($encoding)
 	{
 
@@ -75,7 +81,16 @@ function ee_mb_strlen( $str, $encoding = null ) {
 
 }
 
-if ( ! function_exists('ee_mb_strpos')) {
+/**
+ * Replace deprecated mb_strpos
+ * @param  string  $haystack
+ * @param  string  $needle
+ * @param  integer $offset
+ * @param  string  $encoding
+ * @return mixed - FALSE if not found, integer if found
+ */
+if ( ! function_exists('ee_mb_strpos'))
+{
 
 	function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 	{
@@ -101,6 +116,14 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 
 }
 
+/**
+ * Replace deprecated mb_substr
+ * @param  string $s
+ * @param  string $start
+ * @param  mixed $length
+ * @param  mixed $encoding
+ * @return string
+ */
 if( ! function_exists( 'ee_mb_substr ') ) {
 
 	function ee_mb_substr($s, $start, $length = null, $encoding = null)

From b40161b1fe5c5bc205e9838870fa8cfb57c05632 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 27 Feb 2020 13:04:15 -0500
Subject: [PATCH 059/123] Fixing array variables

---
 system/ee/legacy/libraries/Filemanager.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/system/ee/legacy/libraries/Filemanager.php b/system/ee/legacy/libraries/Filemanager.php
index b489d248be..37cb7b3e8a 100644
--- a/system/ee/legacy/libraries/Filemanager.php
+++ b/system/ee/legacy/libraries/Filemanager.php
@@ -308,12 +308,17 @@ function get_image_dimensions($file_path)
 		{
 			$D = @getimagesize($file_path);
 
-			$image_size = array(
-				'height'	=> $D['1'],
-				'width'	=> $D['0']
+			if($D && is_array($D)) {
+
+				$image_size = array(
+					'height'	=> $D['1'],
+					'width'	=> $D['0']
 				);
 
-			return $image_size;
+				return $image_size;
+
+			}
+
 		}
 
 		return FALSE;

From 4c88eb222ed489fe3af07170b18731f80dedd144 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 2 Mar 2020 05:56:00 -0500
Subject: [PATCH 060/123] Fixing php notice on comments without pagination,
 resolves #378

---
 system/ee/EllisLab/Addons/comment/mod.comment.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/Addons/comment/mod.comment.php b/system/ee/EllisLab/Addons/comment/mod.comment.php
index 13d59102b3..cb55a33f66 100644
--- a/system/ee/EllisLab/Addons/comment/mod.comment.php
+++ b/system/ee/EllisLab/Addons/comment/mod.comment.php
@@ -584,9 +584,13 @@ public function entries()
 		{
 			++$count;
 
+			$absoluteCount = (isset($pagination))
+								? $pagination->offset + $count
+								: $count;
+
 			$vars[] = array_merge(
 				[
-					'absolute_count' => $pagination->offset + $count,
+					'absolute_count' => $absoluteCount,
 					'absolute_results' => $total_results,
 					'absolute_reverse_count' => $total_results - $count + 1,
 					'count' => $count,

From cc3e9fa1d1e8c044cd27f7a4e27f7ffdacd9dbb1 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 2 Mar 2020 13:37:18 -0500
Subject: [PATCH 061/123] Fixing pages URIs not being removed when entries were
 deleted

---
 .../Controller/Publish/Edit.php               | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
index 8079a18bcf..f155f71225 100644
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
@@ -557,6 +557,7 @@ public function entry($id = NULL, $autosave_id = NULL)
 
 	private function remove($entry_ids)
 	{
+
 		if ( ! ee()->cp->allowed_group('can_delete_all_entries')
 			&& ! ee()->cp->allowed_group('can_delete_self_entries'))
 		{
@@ -588,6 +589,33 @@ private function remove($entry_ids)
 
 		$entry_names = $entries->all()->pluck('title');
 
+		// Remove pages URIs
+		$site_id = ee()->config->item('site_id');
+		$site_pages = ee()->config->item('site_pages');
+
+		if ($site_pages !== FALSE && $entries)
+		{
+
+			if (count($site_pages[$site_id]) > 0)
+			{
+
+				foreach ($entries->all() as $entry)
+				{
+
+					unset($site_pages[$site_id]['uris'][$entry->entry_id]);
+					unset($site_pages[$site_id]['templates'][$entry->entry_id]);
+
+					ee()->config->set_item('site_pages', $site_pages);
+
+					$entry->Site->site_pages = $site_pages;
+					$entry->Site->save();
+
+				}
+
+			}
+
+		}
+
 		$entries->delete();
 
 		ee('CP/Alert')->makeInline('entries-form')
@@ -602,4 +630,4 @@ private function remove($entry_ids)
 
 }
 
-// EOF
+// EOF
\ No newline at end of file

From 14a832a207dea2c8cf2603be0cb71128b2b04d8e Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 4 Mar 2020 10:43:52 -0500
Subject: [PATCH 062/123] Fixing pages not being removed after entry deleted

---
 .../Controller/Publish/Edit.php               | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
index 8079a18bcf..f155f71225 100644
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
@@ -557,6 +557,7 @@ public function entry($id = NULL, $autosave_id = NULL)
 
 	private function remove($entry_ids)
 	{
+
 		if ( ! ee()->cp->allowed_group('can_delete_all_entries')
 			&& ! ee()->cp->allowed_group('can_delete_self_entries'))
 		{
@@ -588,6 +589,33 @@ private function remove($entry_ids)
 
 		$entry_names = $entries->all()->pluck('title');
 
+		// Remove pages URIs
+		$site_id = ee()->config->item('site_id');
+		$site_pages = ee()->config->item('site_pages');
+
+		if ($site_pages !== FALSE && $entries)
+		{
+
+			if (count($site_pages[$site_id]) > 0)
+			{
+
+				foreach ($entries->all() as $entry)
+				{
+
+					unset($site_pages[$site_id]['uris'][$entry->entry_id]);
+					unset($site_pages[$site_id]['templates'][$entry->entry_id]);
+
+					ee()->config->set_item('site_pages', $site_pages);
+
+					$entry->Site->site_pages = $site_pages;
+					$entry->Site->save();
+
+				}
+
+			}
+
+		}
+
 		$entries->delete();
 
 		ee('CP/Alert')->makeInline('entries-form')
@@ -602,4 +630,4 @@ private function remove($entry_ids)
 
 }
 
-// EOF
+// EOF
\ No newline at end of file

From f6d0a2101a9157f07a419aa0d2d112d6b21a907b Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 6 Mar 2020 07:36:38 -0500
Subject: [PATCH 063/123] Adjusting code style

---
 system/ee/legacy/helpers/multibyte_helper.php | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index 6ae9c18b18..ad9e19d9c4 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed.');
+<?php if( ! defined('BASEPATH')) exit('No direct script access allowed.');
 
 /**
  * This source file is part of the open source project
@@ -18,19 +18,21 @@
  * @param  string $encoding
  * @return string
  */
-if ( ! function_exists( 'ee_get_encoding' ) )
+if( ! function_exists( 'ee_get_encoding' ) )
 {
 
 	function ee_get_encoding($encoding)
 	{
 
-		if (null === $encoding) {
+		if(null === $encoding)
+		{
 
 			return ee()->config->item('charset') ?: 'utf8';
 
 		}
 
-		if ('UTF-8' === $encoding) {
+		if('UTF-8' === $encoding)
+		{
 
 			return 'UTF-8';
 
@@ -38,13 +40,15 @@ function ee_get_encoding($encoding)
 
 		$encoding = strtoupper($encoding);
 
-		if ( '8BIT' === $encoding || 'BINARY' === $encoding ) {
+		if( '8BIT' === $encoding || 'BINARY' === $encoding )
+		{
 
 			return 'CP850';
 
 		}
 
-		if ( 'UTF8' === $encoding ) {
+		if( 'UTF8' === $encoding )
+		{
 
 			return 'UTF-8';
 
@@ -62,14 +66,16 @@ function ee_get_encoding($encoding)
  * @param  string $encoding
  * @return integer
  */
-if ( ! function_exists('ee_mb_strlen'))
+if( ! function_exists('ee_mb_strlen'))
 {
 
-	function ee_mb_strlen( $str, $encoding = null ) {
+	function ee_mb_strlen( $str, $encoding = null )
+	{
 
 		$encoding = ee_get_encoding($encoding);
 
-		if ('CP850' === $encoding || 'ASCII' === $encoding) {
+		if('CP850' === $encoding || 'ASCII' === $encoding)
+		{
 
 			return strlen($str);
 
@@ -89,14 +95,15 @@ function ee_mb_strlen( $str, $encoding = null ) {
  * @param  string  $encoding
  * @return mixed - FALSE if not found, integer if found
  */
-if ( ! function_exists('ee_mb_strpos'))
+if( ! function_exists('ee_mb_strpos'))
 {
 
 	function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
-		if ('CP850' === $encoding || 'ASCII' === $encoding) {
+		if('CP850' === $encoding || 'ASCII' === $encoding)
+		{
 
 			return strpos($haystack, $needle, $offset);
 
@@ -104,7 +111,8 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 
 		$needle = (string) $needle;
 
-		if ('' === $needle) {
+		if('' === $needle)
+		{
 
 			return false;
 
@@ -124,24 +132,28 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
  * @param  mixed $encoding
  * @return string
  */
-if( ! function_exists( 'ee_mb_substr ') ) {
+if( ! function_exists( 'ee_mb_substr ') )
+{
 
 	function ee_mb_substr($s, $start, $length = null, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
-		if ('CP850' === $encoding || 'ASCII' === $encoding) {
+		if('CP850' === $encoding || 'ASCII' === $encoding)
+		{
 
 			return (string) substr($s, $start, null === $length ? 2147483647 : $length);
 
 
 		}
 
-		if ($start < 0) {
+		if($start < 0)
+		{
 
 			$start = iconv_strlen($s, $encoding) + $start;
 
-			if ($start < 0) {
+			if($start < 0)
+			{
 
 				$start = 0;
 
@@ -149,17 +161,19 @@ function ee_mb_substr($s, $start, $length = null, $encoding = null)
 
 		}
 
-		if (null === $length) {
+		if(null === $length)
+		{
 
 			$length = 2147483647;
 
 		}
-		elseif ($length < 0)
+		elseif($length < 0)
 		{
 
 			$length = iconv_strlen($s, $encoding) + $length - $start;
 
-			if ($length < 0) {
+			if($length < 0)
+			{
 
 				return '';
 

From f81bee7ce06d5a02bfac05fc5a97a49bdc53f2e7 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 6 Mar 2020 07:43:07 -0500
Subject: [PATCH 064/123] Recommended changes in pull

---
 .../Controller/Publish/Edit.php               | 19 +++++++------------
 system/ee/legacy/helpers/multibyte_helper.php | 10 +++++-----
 system/ee/legacy/libraries/Filemanager.php    | 14 +++++++-------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
index f155f71225..026edd7e9c 100644
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Publish/Edit.php
@@ -593,24 +593,19 @@ private function remove($entry_ids)
 		$site_id = ee()->config->item('site_id');
 		$site_pages = ee()->config->item('site_pages');
 
-		if ($site_pages !== FALSE && $entries)
+		if ($site_pages !== FALSE && $entries && count($site_pages[$site_id]) > 0)
 		{
 
-			if (count($site_pages[$site_id]) > 0)
+			foreach ($entries->all() as $entry)
 			{
 
-				foreach ($entries->all() as $entry)
-				{
-
-					unset($site_pages[$site_id]['uris'][$entry->entry_id]);
-					unset($site_pages[$site_id]['templates'][$entry->entry_id]);
+				unset($site_pages[$site_id]['uris'][$entry->entry_id]);
+				unset($site_pages[$site_id]['templates'][$entry->entry_id]);
 
-					ee()->config->set_item('site_pages', $site_pages);
+				ee()->config->set_item('site_pages', $site_pages);
 
-					$entry->Site->site_pages = $site_pages;
-					$entry->Site->save();
-
-				}
+				$entry->Site->site_pages = $site_pages;
+				$entry->Site->save();
 
 			}
 
diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index ad9e19d9c4..d32516d42a 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -135,14 +135,14 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 if( ! function_exists( 'ee_mb_substr ') )
 {
 
-	function ee_mb_substr($s, $start, $length = null, $encoding = null)
+	function ee_mb_substr($str, $start, $length = null, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
 		if('CP850' === $encoding || 'ASCII' === $encoding)
 		{
 
-			return (string) substr($s, $start, null === $length ? 2147483647 : $length);
+			return (string) substr($str, $start, null === $length ? 2147483647 : $length);
 
 
 		}
@@ -150,7 +150,7 @@ function ee_mb_substr($s, $start, $length = null, $encoding = null)
 		if($start < 0)
 		{
 
-			$start = iconv_strlen($s, $encoding) + $start;
+			$start = iconv_strlen($str, $encoding) + $start;
 
 			if($start < 0)
 			{
@@ -170,7 +170,7 @@ function ee_mb_substr($s, $start, $length = null, $encoding = null)
 		elseif($length < 0)
 		{
 
-			$length = iconv_strlen($s, $encoding) + $length - $start;
+			$length = iconv_strlen($str, $encoding) + $length - $start;
 
 			if($length < 0)
 			{
@@ -181,7 +181,7 @@ function ee_mb_substr($s, $start, $length = null, $encoding = null)
 
 		}
 
-		return (string) iconv_substr($s, $start, $length, $encoding);
+		return (string) iconv_substr($str, $start, $length, $encoding);
 
 	}
 
diff --git a/system/ee/legacy/libraries/Filemanager.php b/system/ee/legacy/libraries/Filemanager.php
index 37cb7b3e8a..e518120a9e 100644
--- a/system/ee/legacy/libraries/Filemanager.php
+++ b/system/ee/legacy/libraries/Filemanager.php
@@ -306,16 +306,16 @@ function get_image_dimensions($file_path)
 	{
 		if (function_exists('getimagesize'))
 		{
-			$D = @getimagesize($file_path);
+			$imageSize = @getimagesize($file_path);
 
-			if($D && is_array($D)) {
+			if($imageSize && is_array($imageSize)) {
 
-				$image_size = array(
-					'height'	=> $D['1'],
-					'width'	=> $D['0']
-				);
+				$imageSizeParsed = [
+					'height'	=> $imageSize['1'],
+					'width'	=> $imageSize['0']
+				];
 
-				return $image_size;
+				return $imageSizeParsed;
 
 			}
 

From def683571f5bc2415959dd7c8a93280729e2cd56 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 6 Mar 2020 07:45:24 -0500
Subject: [PATCH 065/123] Fixing conditional order

---
 system/ee/legacy/helpers/multibyte_helper.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index d32516d42a..5c4ffe0ef6 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -24,14 +24,14 @@
 	function ee_get_encoding($encoding)
 	{
 
-		if(null === $encoding)
+		if($encoding === null)
 		{
 
 			return ee()->config->item('charset') ?: 'utf8';
 
 		}
 
-		if('UTF-8' === $encoding)
+		if($encoding === 'UTF-8')
 		{
 
 			return 'UTF-8';
@@ -40,14 +40,14 @@ function ee_get_encoding($encoding)
 
 		$encoding = strtoupper($encoding);
 
-		if( '8BIT' === $encoding || 'BINARY' === $encoding )
+		if($encoding ===  '8BIT' || $encoding === 'BINARY' )
 		{
 
 			return 'CP850';
 
 		}
 
-		if( 'UTF8' === $encoding )
+		if($encoding ===  'UTF8')
 		{
 
 			return 'UTF-8';
@@ -74,7 +74,7 @@ function ee_mb_strlen( $str, $encoding = null )
 
 		$encoding = ee_get_encoding($encoding);
 
-		if('CP850' === $encoding || 'ASCII' === $encoding)
+		if($encoding === 'CP850' || $encoding === 'ASCII')
 		{
 
 			return strlen($str);
@@ -102,7 +102,7 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
-		if('CP850' === $encoding || 'ASCII' === $encoding)
+		if($encoding === 'CP850' || $encoding === 'ASCII')
 		{
 
 			return strpos($haystack, $needle, $offset);

From e0203a99fd36c78530ad3513f0e5ffef19f302c5 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 11 Mar 2020 11:44:07 -0400
Subject: [PATCH 066/123] Fixing conditional

---
 .../ExpressionEngine/Service/Validation/Rule/ExactLength.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
index e70d97da53..fae3436844 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/ExactLength.php
@@ -31,7 +31,7 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		return (ee_mb_strlen($value) < $length) ? FALSE : TRUE;
+		return (ee_mb_strlen($value) == $length);
 
 	}
 

From a860545e247601991e45bcd6a86a2bbecaec90ef Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 11 Mar 2020 11:55:11 -0400
Subject: [PATCH 067/123] Fixing conditional

---
 .../ExpressionEngine/Service/Validation/Rule/MaxLength.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
index 2fbe88b4ba..d8cdfdae97 100644
--- a/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
+++ b/system/ee/EllisLab/ExpressionEngine/Service/Validation/Rule/MaxLength.php
@@ -31,7 +31,7 @@ public function validate($key, $value)
 			return FALSE;
 		}
 
-		return (ee_mb_strlen($value) < $length) ? true : false;
+		return (ee_mb_strlen($value) <= $length);
 
 	}
 

From a70a5aa157f6c8614763af74474c06601f25d2df Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Wed, 11 Mar 2020 16:36:59 -0400
Subject: [PATCH 068/123] Reverting braces for clarity and multibyte support

---
 .../legacy/libraries/simplepie/idn/idna_convert.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
index 408fd2b46b..f57ca12f25 100755
--- a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
+++ b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
@@ -374,7 +374,7 @@ function _decode($encoded)
         $delim_pos = strrpos($encoded, '-');
         if ($delim_pos > strlen($this->_punycode_prefix)) {
             for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
-                $decoded[] = ord($encoded[$k]);
+                $decoded[] = ord($encoded{$k});
             }
         } else {
             $decoded = array();
@@ -391,7 +391,7 @@ function _decode($encoded)
         for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
             for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
                 $enco_idx++;
-                $digit = $this->_decode_digit($encoded[$enco_idx]);
+                $digit = $this->_decode_digit($encoded{$enco_idx});
                 $idx += $digit * $w;
                 $t = ($k <= $bias) ? $this->_tmin :
                         (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
@@ -794,7 +794,7 @@ function _utf8_to_ucs4($input)
         $mode = 'next';
         $test = 'none';
         for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input[$k]); // Extract byte from input string
+            $v = ord($input{$k}); // Extract byte from input string
 
             if ($v < 128) { // We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
@@ -933,7 +933,7 @@ function _ucs4_string_to_ucs4($input)
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input[$i]) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
         }
         return $output;
     }

From 99c005a8c5420c6b6eec140429da5045813a9ad3 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Thu, 12 Mar 2020 11:44:51 -0400
Subject: [PATCH 069/123] Reverting character retrieval for multibyte support

---
 .../legacy/libraries/typography/Markdown/Michelf/Markdown.php | 2 +-
 .../libraries/typography/Markdown/Michelf/MarkdownExtra.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
index 59db13d5f4..e9c0c1a0ac 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
@@ -797,7 +797,7 @@ protected function _doHeaders_callback_setext($matches) {
 		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
 			return $matches[0];
 		
-		$level = $matches[2][0] == '=' ? 1 : 2;
+		$level = $matches[2]{0} == '=' ? 1 : 2;
 
 		# id attribute generation
 		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
index d27cb62116..2ad5196524 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
@@ -160,9 +160,9 @@ protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $
 		$attributes = array();
 		$id = false;
 		foreach ($elements as $element) {
-			if ($element[0] == '.') {
+			if ($element{0} == '.') {
 				$classes[] = substr($element, 1);
-			} else if ($element[0] == '#') {
+			} else if ($element{0} == '#') {
 				if ($id === false) $id = substr($element, 1);
 			} else if (strpos($element, '=') > 0) {
 				$parts = explode('=', $element, 2);

From a0e943293a12c93d0886c26236003addc74453d6 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 08:50:08 -0400
Subject: [PATCH 070/123] Fixing glue/pieces issue

---
 system/ee/legacy/models/search_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/models/search_model.php b/system/ee/legacy/models/search_model.php
index f53ff20a85..f8c09e2166 100644
--- a/system/ee/legacy/models/search_model.php
+++ b/system/ee/legacy/models/search_model.php
@@ -288,7 +288,7 @@ function build_main_query($data, $order = array(), $cp = TRUE)
 
 					if (count($keyword_clauses))
 					{
-						$where_clause .= " AND (" . join($keyword_clauses, ' AND ');
+						$where_clause .= " AND (" . join(' AND ', $keyword_clauses);
 					}
 					else
 					{

From 38447081458acc432a4b70f08272e8152b096e0c Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 08:50:44 -0400
Subject: [PATCH 071/123] Removing safe mode

---
 system/ee/legacy/libraries/Core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Core.php b/system/ee/legacy/libraries/Core.php
index 5208136c71..513caa7bf7 100644
--- a/system/ee/legacy/libraries/Core.php
+++ b/system/ee/legacy/libraries/Core.php
@@ -41,7 +41,7 @@ public function bootstrap()
 		}
 
 		// Set a liberal script execution time limit, making it shorter for front-end requests than CI's default
-		if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
+		if (function_exists("set_time_limit") == TRUE)
 		{
 			@set_time_limit((REQ == 'CP') ? 300 : 90);
 		}

From 35bd4b176dbb6bbb1f2639b5cfddc515003693c8 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 08:51:51 -0400
Subject: [PATCH 072/123] Fixing glue  pieces

---
 system/ee/legacy/libraries/Fluid_field_parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Fluid_field_parser.php b/system/ee/legacy/libraries/Fluid_field_parser.php
index 03810b045a..a539b3f12f 100644
--- a/system/ee/legacy/libraries/Fluid_field_parser.php
+++ b/system/ee/legacy/libraries/Fluid_field_parser.php
@@ -112,7 +112,7 @@ public function pre_process($tagdata, $pre_parser, array $fluid_field_fields, $c
 	 */
 	private function getPossibleFields(array $field_channel_fields)
 	{
-		$cache_key = 'ChannelFields/' . implode($field_channel_fields, ',') . '/field_name';
+		$cache_key = 'ChannelFields/' . implode(',', $field_channel_fields) . '/field_name';
 
 		if (($possible_fields = ee()->session->cache(__CLASS__, $cache_key, FALSE)) === FALSE)
 		{

From 85b4d0a24e9aa6d565a38e726a04b4569be03cce Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 08:53:02 -0400
Subject: [PATCH 073/123] Fixing deprecated function

---
 system/ee/legacy/libraries/Image_lib.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/system/ee/legacy/libraries/Image_lib.php b/system/ee/legacy/libraries/Image_lib.php
index ec5ef38d39..f11abb1d9b 100644
--- a/system/ee/legacy/libraries/Image_lib.php
+++ b/system/ee/legacy/libraries/Image_lib.php
@@ -1533,15 +1533,9 @@ function explode_name($source_image)
 	 */
 	function gd_loaded()
 	{
-		if ( ! extension_loaded('gd'))
-		{
-			if (! function_exists('dl') OR ! @dl('gd.so'))
-			{
-				return FALSE;
-			}
-		}
 
-		return TRUE;
+		return extension_loaded('gd');
+
 	}
 
 	/**

From 34196a8d0cb910eb3b8f70ae87aab5ff2a6a39a1 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 08:56:55 -0400
Subject: [PATCH 074/123] Removing overload check

---
 system/ee/legacy/core/Utf8.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/ee/legacy/core/Utf8.php b/system/ee/legacy/core/Utf8.php
index 73c61631ef..177310aa2b 100644
--- a/system/ee/legacy/core/Utf8.php
+++ b/system/ee/legacy/core/Utf8.php
@@ -30,7 +30,6 @@ public function __construct()
 		if (
 			preg_match('/./u', 'é') === 1						// PCRE must support UTF-8
 			AND function_exists('iconv')						// iconv must be installed
-			AND ! (bool) (ini_get('mbstring.func_overload') & 2)	// Multibyte string function overloading cannot be enabled
 			AND $CFG->item('charset') == 'UTF-8'				// Application charset must be UTF-8
 			)
 		{

From bf540c44873bb82232b899b4df6ca717ec8f0ae3 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 09:05:04 -0400
Subject: [PATCH 075/123] Removing more overloads

---
 .../Compat/Random/byte_safe_strings.php       | 186 +++++-------------
 .../Library/Parser/AbstractLexer.php          |   6 +-
 2 files changed, 48 insertions(+), 144 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
index c4ee616ccb..17e3cd0366 100755
--- a/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Compat/Random/byte_safe_strings.php
@@ -27,160 +27,68 @@
  */
 
 if (!is_callable('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING') &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-
-
-            ee()->load->helper('multibyte');
 
-            return (int) ee_mb_strlen($binary_string, '8bit');
-        }
-
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return (int) strlen($binary_string);
+    /**
+     * strlen() implementation that isn't brittle to mbstring.func_overload
+     *
+     * This version just used the default strlen()
+     *
+     * @param string $binary_string
+     *
+     * @throws TypeError
+     *
+     * @return int
+     */
+    function RandomCompat_strlen($binary_string)
+    {
+        if (!is_string($binary_string)) {
+            throw new TypeError(
+                'RandomCompat_strlen() expects a string'
+            );
         }
+        return (int) strlen($binary_string);
     }
 }
 
 if (!is_callable('RandomCompat_substr')) {
 
-    if (
-        defined('MB_OVERLOAD_STRING')
-        &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+    /**
+     * substr() implementation that isn't brittle to mbstring.func_overload
+     *
+     * This version just uses the default substr()
+     *
+     * @param string $binary_string
+     * @param int $start
+     * @param int $length (optional)
+     *
+     * @throws TypeError
+     *
+     * @return string
+     */
+    function RandomCompat_substr($binary_string, $start, $length = null)
+    {
+        if (!is_string($binary_string)) {
+            throw new TypeError(
+                'RandomCompat_substr(): First argument should be a string'
+            );
+        }
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+        if (!is_int($start)) {
+            throw new TypeError(
+                'RandomCompat_substr(): Second argument should be an integer'
+            );
+        }
 
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                $length = RandomCompat_strlen($binary_string) - $start;
-            } elseif (!is_int($length)) {
+        if ($length !== null) {
+            if (!is_int($length)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
             }
 
-            // Consistency with PHP's behavior
-            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
-                return '';
-            }
-            if ($start > RandomCompat_strlen($binary_string)) {
-                return '';
-            }
-
-            ee()->load->helper('multibyte');
-
-            return (string) ee_mb_substr($binary_string, $start, $length, '8bit');
+            return (string) substr($binary_string, $start, $length);
         }
 
-    } else {
-
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
-
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
-
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
-
-                return (string) substr($binary_string, $start, $length);
-            }
-
-            return (string) substr($binary_string, $start);
-        }
+        return (string) substr($binary_string, $start);
     }
 }
diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Parser/AbstractLexer.php b/system/ee/EllisLab/ExpressionEngine/Library/Parser/AbstractLexer.php
index 8e14bf39f3..b8a587660f 100644
--- a/system/ee/EllisLab/ExpressionEngine/Library/Parser/AbstractLexer.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Parser/AbstractLexer.php
@@ -76,11 +76,7 @@ protected function seekTo($char_mask)
 		// if mbstring.func_overload is enabled strcspn here and substr in move()
 		// will not have matching lengths, so only use strcspn when they match
 		// and fall back to regex otherwise
-		if ( ! (ini_get('mbstring.func_overload') & 2))
-		{
-			$n = strcspn($this->str, $char_mask);
-		}
-		elseif ($n = preg_match('/^[^'.preg_quote($char_mask, '/').']*/', $this->str, $matches))
+		if ($n = preg_match('/^[^'.preg_quote($char_mask, '/').']*/', $this->str, $matches))
 		{
 			$n = strlen($matches[0]);
 		}

From 8b0e8647ed068568bec5ecbb093425a486bc6d57 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 09:05:21 -0400
Subject: [PATCH 076/123] Fixing global var warning

---
 system/ee/legacy/core/Input.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
index 14ca8d11d6..7b6fb5725a 100644
--- a/system/ee/legacy/core/Input.php
+++ b/system/ee/legacy/core/Input.php
@@ -829,8 +829,12 @@ function _sanitize_globals()
 			{
 				if ( ! in_array($global, $protected))
 				{
-					global ${$global};
+					$variableToUse = ${$global};
+					
+					global $variableToUse;
+
 					$$global = NULL;
+
 				}
 			}
 			else
@@ -839,8 +843,12 @@ function _sanitize_globals()
 				{
 					if ( ! in_array($key, $protected))
 					{
-						global ${$key};
+						$variableToUse = ${$key};
+						
+						global $variableToUse;
+
 						$$key = NULL;
+
 					}
 				}
 			}

From c83663934115219744981331350e16442a653f34 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 09:27:41 -0400
Subject: [PATCH 077/123] Reverting input error

---
 system/ee/legacy/core/Input.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/system/ee/legacy/core/Input.php b/system/ee/legacy/core/Input.php
index 7b6fb5725a..c3f192bf07 100644
--- a/system/ee/legacy/core/Input.php
+++ b/system/ee/legacy/core/Input.php
@@ -829,9 +829,8 @@ function _sanitize_globals()
 			{
 				if ( ! in_array($global, $protected))
 				{
-					$variableToUse = ${$global};
 					
-					global $variableToUse;
+					global ${$global};
 
 					$$global = NULL;
 
@@ -843,9 +842,8 @@ function _sanitize_globals()
 				{
 					if ( ! in_array($key, $protected))
 					{
-						$variableToUse = ${$key};
 						
-						global $variableToUse;
+						global ${$key};
 
 						$$key = NULL;
 

From beef79465ddde482f059ee7c538ce00e9c0cd3e6 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 11:38:26 -0400
Subject: [PATCH 078/123] Adding PHP versions

---
 tests/docker/runtests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/docker/runtests.sh b/tests/docker/runtests.sh
index da1e74760b..85cf134df9 100644
--- a/tests/docker/runtests.sh
+++ b/tests/docker/runtests.sh
@@ -28,6 +28,8 @@ while [[ $# > 0 ]]
 	key="$1"
 
 	# Default PHP version
+	# PHP_VERSION="5.6.0"
+	#PHP_VERSION="7.2.11"
 	PHP_VERSION="7.4.1"
 
 	case $key in

From 37b916a930be7397c3baedb6ff38e9317e144220 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 14:30:59 -0400
Subject: [PATCH 079/123] Adding shim for PHP7.4 GD not installing JPEG library
 by default, fixing upload image size check for non-images in file syncing

---
 .../Controller/Files/Uploads.php              | 21 ++++++++++++++-----
 system/ee/legacy/libraries/Filemanager.php    | 12 ++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php b/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
index b110c61d9f..7c0e11bf21 100644
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
@@ -876,8 +876,8 @@ public function doSyncFiles()
 		// If db record exists- make sure file exists -  otherwise delete from db - ?? check for child sizes??
 
 		if (
-			($current_files = ee()->input->post('files')) === FALSE AND
-			$db_sync != 'y'
+			($current_files = ee()->input->post('files')) === FALSE
+			&& $db_sync != 'y'
 		)
 		{
 			return FALSE;
@@ -1046,6 +1046,7 @@ public function doSyncFiles()
 					'file_size'				=> filesize($file_path_name),
 					'file_hw_original'		=> $image_dimensions['height'] . ' ' . $image_dimensions['width']
 				);
+
 				ee()->file_model->save_file($file_data);
 
 				continue;
@@ -1063,6 +1064,11 @@ public function doSyncFiles()
 
 			$image_dimensions = ee()->filemanager->get_image_dimensions($file_path);
 
+			// This may not be an image, in which case
+			$imageDimensionsToWrite = is_array($image_dimensions)
+						? $image_dimensions['height'] . ' ' . $image_dimensions['width']
+						: '';
+
 			$file_data = array(
 				'upload_location_id'	=> $id,
 				'site_id'				=> $this->config->item('site_id'),
@@ -1071,13 +1077,18 @@ public function doSyncFiles()
 				'file_size'				=> $file['size'],
 				'uploaded_by_member_id'	=> ee()->session->userdata('member_id'),
 				'modified_by_member_id' => ee()->session->userdata('member_id'),
-				'file_hw_original'		=> $image_dimensions['height'] . ' ' . $image_dimensions['width'],
+				'file_hw_original'		=> $imageDimensionsToWrite,
 				'upload_date'			=> $file['date'],
 				'modified_date'			=> $file['date']
 			);
 
-
-			$saved = ee()->filemanager->save_file($this->_upload_dirs[$id]['server_path'].$file['name'], $id, $file_data, FALSE);
+			$saved = ee()->filemanager
+						->save_file(
+							$this->_upload_dirs[$id]['server_path'] . $file['name'],
+							$id,
+							$file_data,
+							FALSE
+						);
 
 			if ( ! $saved['status'])
 			{
diff --git a/system/ee/legacy/libraries/Filemanager.php b/system/ee/legacy/libraries/Filemanager.php
index e518120a9e..79b0983d55 100644
--- a/system/ee/legacy/libraries/Filemanager.php
+++ b/system/ee/legacy/libraries/Filemanager.php
@@ -215,6 +215,7 @@ function fetch_upload_dir_prefs($dir_id, $ignore_site_id = FALSE)
 	 */
 	function security_check($file_path, $prefs)
 	{
+
 		ee()->load->helper(array('file', 'xss'));
 		ee()->load->library('mime_type');
 
@@ -304,9 +305,18 @@ function is_editable_image($file_path, $mime)
 	 */
 	function get_image_dimensions($file_path)
 	{
+
+		if( ! file_exists($file_path)) {
+
+			return FALSE;
+
+		}
+
+		// PHP7.4 does not come with GD JPEG processing by default
+		// So, we need to run this check.
 		if (function_exists('getimagesize'))
 		{
-			$imageSize = @getimagesize($file_path);
+			$imageSize = getimagesize($file_path);
 
 			if($imageSize && is_array($imageSize)) {
 

From da2c9f0ef6af9be59084650e0e66844fe8f147ce Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 15 Mar 2020 14:34:11 -0400
Subject: [PATCH 080/123] Whitespace

---
 .../ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php b/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
index 7c0e11bf21..2bc8b25b29 100644
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Files/Uploads.php
@@ -1067,7 +1067,7 @@ public function doSyncFiles()
 			// This may not be an image, in which case
 			$imageDimensionsToWrite = is_array($image_dimensions)
 						? $image_dimensions['height'] . ' ' . $image_dimensions['width']
-						: '';
+						: ' ';
 
 			$file_data = array(
 				'upload_location_id'	=> $id,

From f30b3f340479db32718c0d2ecc70db69432aa7ee Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 16 Mar 2020 06:34:54 -0400
Subject: [PATCH 081/123] Reverting for PHP7.4 RFC compliance

---
 .../legacy/libraries/simplepie/idn/idna_convert.class.php | 8 ++++----
 .../libraries/typography/Markdown/Michelf/Markdown.php    | 3 ++-
 .../typography/Markdown/Michelf/MarkdownExtra.php         | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
index f57ca12f25..408fd2b46b 100755
--- a/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
+++ b/system/ee/legacy/libraries/simplepie/idn/idna_convert.class.php
@@ -374,7 +374,7 @@ function _decode($encoded)
         $delim_pos = strrpos($encoded, '-');
         if ($delim_pos > strlen($this->_punycode_prefix)) {
             for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
-                $decoded[] = ord($encoded{$k});
+                $decoded[] = ord($encoded[$k]);
             }
         } else {
             $decoded = array();
@@ -391,7 +391,7 @@ function _decode($encoded)
         for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
             for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
                 $enco_idx++;
-                $digit = $this->_decode_digit($encoded{$enco_idx});
+                $digit = $this->_decode_digit($encoded[$enco_idx]);
                 $idx += $digit * $w;
                 $t = ($k <= $bias) ? $this->_tmin :
                         (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
@@ -794,7 +794,7 @@ function _utf8_to_ucs4($input)
         $mode = 'next';
         $test = 'none';
         for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input{$k}); // Extract byte from input string
+            $v = ord($input[$k]); // Extract byte from input string
 
             if ($v < 128) { // We found an ASCII char - put into stirng as is
                 $output[$out_len] = $v;
@@ -933,7 +933,7 @@ function _ucs4_string_to_ucs4($input)
                 $out_len++;
                 $output[$out_len] = 0;
             }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+            $output[$out_len] += ord($input[$i]) << (8 * (3 - ($i % 4) ) );
         }
         return $output;
     }
diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
index e9c0c1a0ac..62acda42dd 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/Markdown.php
@@ -797,7 +797,8 @@ protected function _doHeaders_callback_setext($matches) {
 		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
 			return $matches[0];
 		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
+		// Getting the first character in the appropriate match
+		$level = $matches[2][0] == '=' ? 1 : 2;
 
 		# id attribute generation
 		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
diff --git a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
index 2ad5196524..1c11470e05 100755
--- a/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
+++ b/system/ee/legacy/libraries/typography/Markdown/Michelf/MarkdownExtra.php
@@ -160,9 +160,10 @@ protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $
 		$attributes = array();
 		$id = false;
 		foreach ($elements as $element) {
-			if ($element{0} == '.') {
+			// Getting the first character in string $element
+			if ($element[0] == '.') {
 				$classes[] = substr($element, 1);
-			} else if ($element{0} == '#') {
+			} else if ($element[0] == '#') {
 				if ($id === false) $id = substr($element, 1);
 			} else if (strpos($element, '=') > 0) {
 				$parts = explode('=', $element, 2);

From 09fac6ba151e839791b81b8bac99c47d009c2c9f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 22 Mar 2020 11:01:07 -0400
Subject: [PATCH 082/123] Fixing for failing get image size

---
 system/ee/legacy/libraries/Filemanager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Filemanager.php b/system/ee/legacy/libraries/Filemanager.php
index 79b0983d55..c59b13c61b 100644
--- a/system/ee/legacy/libraries/Filemanager.php
+++ b/system/ee/legacy/libraries/Filemanager.php
@@ -316,7 +316,7 @@ function get_image_dimensions($file_path)
 		// So, we need to run this check.
 		if (function_exists('getimagesize'))
 		{
-			$imageSize = getimagesize($file_path);
+			$imageSize = @getimagesize($file_path);
 
 			if($imageSize && is_array($imageSize)) {
 
@@ -331,6 +331,7 @@ function get_image_dimensions($file_path)
 
 		}
 
+		// The file is either not an image, or there was an error.
 		return FALSE;
 	}
 

From 5a7a8ae96ea8373b9832dfe45fa2c51e1ebf615f Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Sun, 22 Mar 2020 13:49:43 -0400
Subject: [PATCH 083/123] Catching blank input for includes on RTE

---
 system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php | 10 +++++++---
 system/ee/EllisLab/Addons/rte/mod.rte.php           |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php b/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
index 0dc1235149..fe95123482 100644
--- a/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
+++ b/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
@@ -295,10 +295,14 @@ private function save_toolset()
 	 * @param	bool	If TRUE, includes tools that are for the control panel only
 	 * @return	string 	The JS needed to embed the RTE
 	 */
-	public function build_js($toolset_id, $selector, $include = array(), $cp_only = FALSE)
+	public function build_js($toolset_id, $selector, $include = [], $cp_only = FALSE)
 	{
 		ee()->load->model(array('rte_toolset_model','rte_tool_model'));
 
+		if( ! is_array($include) ) {
+			$include = [];
+		}
+
 		// no toolset specified?
 		if ( ! $toolset_id)
 		{
@@ -332,7 +336,7 @@ public function build_js($toolset_id, $selector, $include = array(), $cp_only =
 			)
 		);
 
-		if ($include['jquery_ui'])
+		if (array_key_exists('jquery_ui', $include) && $include['jquery_ui'])
 		{
 			$bits['libraries']['ui'] = array('core', 'widget');
 		}
@@ -405,7 +409,7 @@ public function build_js($toolset_id, $selector, $include = array(), $cp_only =
 			$js .= '
 				var EE = ' . json_encode(ee()->javascript->global_vars) . ';';
 
-			if ($include['jquery'])
+			if (array_key_exists('jquery', $include) && $include['jquery'])
 			{
 				$js .= '
 					var j = document.createElement("script");
diff --git a/system/ee/EllisLab/Addons/rte/mod.rte.php b/system/ee/EllisLab/Addons/rte/mod.rte.php
index c77a5567c8..8073c0e1c8 100755
--- a/system/ee/EllisLab/Addons/rte/mod.rte.php
+++ b/system/ee/EllisLab/Addons/rte/mod.rte.php
@@ -33,6 +33,8 @@ public function get_js()
 		$include 		= explode(',', ee()->input->get('include', TRUE));
 
 		// all allowed includes default to FALSE
+		$includes = [];
+
 		foreach (array('jquery', 'jquery_ui') as $allowed)
 		{
 			$includes[$allowed] = in_array($allowed, $include);

From 28843f3dd50067856a270a6b2026eb6ebe3eaf54 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 23 Mar 2020 09:22:42 -0400
Subject: [PATCH 084/123] Fixes missing variable in MSM drag and drop

---
 .../ee/asset/javascript/src/fields/file/drag_and_drop_upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ee/asset/javascript/src/fields/file/drag_and_drop_upload.js b/themes/ee/asset/javascript/src/fields/file/drag_and_drop_upload.js
index 6fad2d767f..a57b83be8e 100644
--- a/themes/ee/asset/javascript/src/fields/file/drag_and_drop_upload.js
+++ b/themes/ee/asset/javascript/src/fields/file/drag_and_drop_upload.js
@@ -176,7 +176,7 @@ function (_React$Component) {
       directory = EE.dragAndDrop.uploadDesinations.find(function (thisDirectory) {
         return thisDirectory.value == directory;
       });
-      return directory.label;
+      return directory ? directory.label : directory;
     }
   }, {
     key: "bindDragAndDropEvents",

From 2bdca90008fd8526c5f6cc57d4c232da7718caf6 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 23 Mar 2020 09:24:45 -0400
Subject: [PATCH 085/123] Adding changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..6c5bf80640 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Fixed a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
 
 
 

From d7e4615cb66f99ac64c33df0189cd0b878989d7a Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 23 Mar 2020 14:06:25 -0400
Subject: [PATCH 086/123] Adding non-duplicated fix from rjpdev:stability

---
 system/ee/legacy/libraries/Template.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index 29e1fba042..9c4a3a942e 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -3527,8 +3527,9 @@ function log_item($str, $details = FALSE)
 
 		$last = end($this->log);
 		$time = number_format($time, 6);
-		$time_gain = $time - $last['time'];
-		$memory_gain = $memory_usage - $last['memory'];
+		$last_time = isset($last['time']) ? $last['time'] : 0;
+		$time_gain = $time - $last_time;
+		$last_memory = isset($last['memory']) ? $last['memory'] : 0
 
 		$this->log[] = array(
 			'time' => $time,

From b2c7453e61ef5b0ac8d0ffa0cefc191eca26efee Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 23 Mar 2020 14:21:26 -0400
Subject: [PATCH 087/123] Bumping rspec dependencies

---
 changelogs/patch.md      | 5 +++--
 tests/rspec/Gemfile.lock | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 63ae16863d..134efdd647 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -12,8 +12,9 @@ Bullet list below, e.g.
    - Added default to same page for consent return
    - Fixes bug where `after_channel_entry_save` hook would run twice.
    - Ignores url_title in fetch param function, for issues related to URL titles called `n`
-   - Fixed strpos `Non-string needles will be interpreted as strings in the future.` issue
-   - Fixed a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
+   - Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
+   - Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
+   - Fixes error in Pages module that leaves orphaned entries 
 
 
 EOF MARKER: This line helps prevent merge conflicts when things are
diff --git a/tests/rspec/Gemfile.lock b/tests/rspec/Gemfile.lock
index d3fab1a251..084f0b75e7 100644
--- a/tests/rspec/Gemfile.lock
+++ b/tests/rspec/Gemfile.lock
@@ -38,14 +38,14 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.10.3)
     mysql2 (0.4.10)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
     php-serialize (1.2.0)
     public_suffix (3.0.1)
-    rack (2.0.3)
+    rack (2.0.8)
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rspec (3.7.0)

From af2d2d74920b9ab43409cbe00315b5cbc4c23cbe Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 23 Mar 2020 18:31:34 -0400
Subject: [PATCH 088/123] Updating capybara-webkit

---
 tests/rspec/Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/rspec/Gemfile.lock b/tests/rspec/Gemfile.lock
index 084f0b75e7..e1d1377da1 100644
--- a/tests/rspec/Gemfile.lock
+++ b/tests/rspec/Gemfile.lock
@@ -22,8 +22,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.14.0)
-      capybara (>= 2.3.0, < 2.14.0)
+    capybara-webkit (1.15.1)
+      capybara (>= 2.3, < 4.0)
       json
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
@@ -31,7 +31,7 @@ GEM
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     image_size (1.5.0)
-    json (2.1.0)
+    json (2.3.0)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     mime-types (3.1)

From 71e4e5c519a960793c51013711562de035017bbc Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 24 Mar 2020 08:39:37 -0400
Subject: [PATCH 089/123] Reverting test updates, fixing missing semicolon

---
 system/ee/legacy/libraries/Template.php |  2 +-
 tests/rspec/Gemfile.lock                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index fe2f8d8cfb..929436a785 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -3538,7 +3538,7 @@ function log_item($str, $details = FALSE)
 		$time = number_format($time, 6);
 		$last_time = isset($last['time']) ? $last['time'] : 0;
 		$time_gain = $time - $last_time;
-		$last_memory = isset($last['memory']) ? $last['memory'] : 0
+		$last_memory = isset($last['memory']) ? $last['memory'] : 0;
 
 		$this->log[] = array(
 			'time' => $time,
diff --git a/tests/rspec/Gemfile.lock b/tests/rspec/Gemfile.lock
index e1d1377da1..d3fab1a251 100644
--- a/tests/rspec/Gemfile.lock
+++ b/tests/rspec/Gemfile.lock
@@ -22,8 +22,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.15.1)
-      capybara (>= 2.3, < 4.0)
+    capybara-webkit (1.14.0)
+      capybara (>= 2.3.0, < 2.14.0)
       json
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
@@ -31,21 +31,21 @@ GEM
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     image_size (1.5.0)
-    json (2.3.0)
+    json (2.1.0)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     mysql2 (0.4.10)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     php-serialize (1.2.0)
     public_suffix (3.0.1)
-    rack (2.0.8)
+    rack (2.0.3)
     rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rspec (3.7.0)

From 6b4dd2c0ca1cbbc67660ef8a7eb0e17eaf7c8240 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 24 Mar 2020 08:52:49 -0400
Subject: [PATCH 090/123] Moving changelog to minor

---
 changelogs/minor.md |  9 +++++++++
 changelogs/patch.md | 11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index a6821684c4..f4daf00ce8 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -6,6 +6,15 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 - Adds support for PHP7.4
 - Removes deprecated function, bringing true minimum version to 5.6
+- Adds validation for pages URIs without a selected template
+- Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
+- Fixes variable type notices
+- Added default to same page for consent return
+- Fixes bug where `after_channel_entry_save` hook would run twice.
+- Ignores url_title in fetch param function, for issues related to URL titles called `n`
+- Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
+- Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
+- Fixes error in Pages module that leaves orphaned entries
 
 
 
diff --git a/changelogs/patch.md b/changelogs/patch.md
index 134efdd647..6eb2941a4a 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,16 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Adds PHP7.4 support
-   - Adds validation for pages URIs without a selected template
-   - Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
-   - Fixes variable type notices
-   - Added default to same page for consent return
-   - Fixes bug where `after_channel_entry_save` hook would run twice.
-   - Ignores url_title in fetch param function, for issues related to URL titles called `n`
-   - Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
-   - Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
-   - Fixes error in Pages module that leaves orphaned entries 
+
 
 
 EOF MARKER: This line helps prevent merge conflicts when things are

From 67726df4e27fc65b4aa9942bdc1b191e2eb2ce46 Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 24 Mar 2020 11:53:41 -0400
Subject: [PATCH 091/123] Fixing conditional

---
 system/ee/legacy/libraries/Template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index 929436a785..d2827c6d96 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -1906,7 +1906,7 @@ public function process_tags()
 	public function fetch_param($which, $default = FALSE)
 	{
 
-		if(in_array($which, $this->ignore_fetch)) {
+		if(isset($this->tagparams[$which]) && in_array($which, $this->ignore_fetch)) {
 
 			return $this->tagparams[$which];
 

From e1d0bea43c2d058f96dd647a114a3d0ab7c121dc Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Tue, 24 Mar 2020 11:54:33 -0400
Subject: [PATCH 092/123] Reverting changelog

---
 changelogs/minor.md | 12 +-----------
 changelogs/patch.md | 11 +++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index f4daf00ce8..09344b8678 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -4,17 +4,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 ## Minor Release
 
-- Adds support for PHP7.4
-- Removes deprecated function, bringing true minimum version to 5.6
-- Adds validation for pages URIs without a selected template
-- Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
-- Fixes variable type notices
-- Added default to same page for consent return
-- Fixes bug where `after_channel_entry_save` hook would run twice.
-- Ignores url_title in fetch param function, for issues related to URL titles called `n`
-- Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
-- Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
-- Fixes error in Pages module that leaves orphaned entries
+Bullet list below, e.g.
 
 
 
diff --git a/changelogs/patch.md b/changelogs/patch.md
index 6eb2941a4a..edd26bc83d 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -6,6 +6,17 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 Bullet list below, e.g.
 
+- Adds support for PHP7.4
+- Removes deprecated function, bringing true minimum version to 5.6
+- Adds validation for pages URIs without a selected template
+- Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
+- Fixes variable type notices
+- Added default to same page for consent return
+- Fixes bug where `after_channel_entry_save` hook would run twice.
+- Ignores url_title in fetch param function, for issues related to URL titles called `n`
+- Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
+- Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
+- Fixes error in Pages module that leaves orphaned entries
 
 
 EOF MARKER: This line helps prevent merge conflicts when things are

From 2454e76cf537260863690c6f7c2f954f842f8d6d Mon Sep 17 00:00:00 2001
From: Andy McCormick <andy@packettide.com>
Date: Tue, 31 Mar 2020 09:01:54 -0400
Subject: [PATCH 093/123] adds update file for 5.3.1 release

---
 system/ee/installer/updates/ud_5_03_01.php | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 system/ee/installer/updates/ud_5_03_01.php

diff --git a/system/ee/installer/updates/ud_5_03_01.php b/system/ee/installer/updates/ud_5_03_01.php
new file mode 100644
index 0000000000..1436989707
--- /dev/null
+++ b/system/ee/installer/updates/ud_5_03_01.php
@@ -0,0 +1,32 @@
+<?php
+/**
+* This source file is part of the open source project
+* ExpressionEngine (https://expressionengine.com)
+*
+* @link      https://expressionengine.com/
+* @copyright Copyright (c) 2003-2019, EllisLab Corp. (https://ellislab.com)
+* @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
+*/
+
+namespace EllisLab\ExpressionEngine\Updater\Version_5_3_1;
+
+/**
+* Update
+*/
+class Updater {
+
+	var $version_suffix = '';
+
+	/**
+	* Do Update
+	*
+	* @return TRUE
+	*/
+	public function do_update()
+	{
+		return TRUE;
+	}
+
+}
+
+// EOF

From 7a2099364c232884f6b3c0f7e21432352519e4ec Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Thu, 2 Apr 2020 14:00:27 -0400
Subject: [PATCH 094/123] Patch version bump

---
 system/ee/installer/controllers/wizard.php | 2 +-
 system/ee/legacy/libraries/Core.php        | 4 ++--
 tests/circleci/config.php                  | 2 +-
 tests/docker/config.php                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/ee/installer/controllers/wizard.php b/system/ee/installer/controllers/wizard.php
index c3ef6876f5..6f1c4506b7 100644
--- a/system/ee/installer/controllers/wizard.php
+++ b/system/ee/installer/controllers/wizard.php
@@ -13,7 +13,7 @@
  */
 class Wizard extends CI_Controller {
 
-	public $version           = '5.3.0';	// The version being installed
+	public $version           = '5.3.1';	// The version being installed
 	public $installed_version = ''; 		// The version the user is currently running (assuming they are running EE)
 	public $schema            = NULL;		// This will contain the schema object with our queries
 	public $languages         = array(); 	// Available languages the installer supports (set dynamically based on what is in the "languages" folder)
diff --git a/system/ee/legacy/libraries/Core.php b/system/ee/legacy/libraries/Core.php
index 513caa7bf7..926b203b05 100644
--- a/system/ee/legacy/libraries/Core.php
+++ b/system/ee/legacy/libraries/Core.php
@@ -72,8 +72,8 @@ public function bootstrap()
 
 		// application constants
 		define('APP_NAME',		'ExpressionEngine');
-		define('APP_BUILD',		'20190928');
-		define('APP_VER',		'5.3.0');
+		define('APP_BUILD',		'20200402');
+		define('APP_VER',		'5.3.1');
 		define('APP_VER_ID',	'');
 		define('SLASH',			'&#47;');
 		define('LD',			'{');
diff --git a/tests/circleci/config.php b/tests/circleci/config.php
index 5de60dc9c2..9a7adbe4d4 100644
--- a/tests/circleci/config.php
+++ b/tests/circleci/config.php
@@ -19,7 +19,7 @@
 }
 
 $config['site_url'] = 'http://ee2.test:8080/';
-$config['app_version'] = '5.3.0';
+$config['app_version'] = '5.3.1';
 $config['license_contact'] = 'ellislab.developers@gmail.com';
 $config['license_number'] = '1234-5678-9123-4567';
 $config['debug'] = '1';
diff --git a/tests/docker/config.php b/tests/docker/config.php
index 1e6a17802f..7cf0ffc90c 100644
--- a/tests/docker/config.php
+++ b/tests/docker/config.php
@@ -20,7 +20,7 @@
 
 $config['base_url'] = 'http://localhost/';
 $config['site_url'] = $config['base_url'];
-$config['app_version'] = '5.3.0';
+$config['app_version'] = '5.3.1';
 $config['license_contact'] = 'ellislab.devleopers@gmail.com';
 $config['license_number'] = '1234-5678-9123-4567';
 $config['debug'] = '1';

From e17e3ddd71bff12c0731033af460170c4a484a2e Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Fri, 3 Apr 2020 10:51:16 -0400
Subject: [PATCH 095/123] Fixing missing variable

---
 system/ee/legacy/libraries/Template.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index d2827c6d96..e868d1bac0 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -3539,6 +3539,7 @@ function log_item($str, $details = FALSE)
 		$last_time = isset($last['time']) ? $last['time'] : 0;
 		$time_gain = $time - $last_time;
 		$last_memory = isset($last['memory']) ? $last['memory'] : 0;
+		$memory_gain = $memory_usage - $last['memory'];
 
 		$this->log[] = array(
 			'time' => $time,

From e3e3dc56c82a4334bd9cab65a949f8a1d6211096 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Fri, 3 Apr 2020 11:35:00 -0400
Subject: [PATCH 096/123] Loading logger library to fix issue with running
 one-click updater

---
 .../EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
index f73b9e7d56..a453f7e16f 100644
--- a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
+++ b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
@@ -144,6 +144,7 @@ public function updateDatabase($step = NULL)
 			$this->makeLoggerService()->log($log_message);
 
 			// Legacy logger lib to log versions to update_log table
+			ee()->load->library('logger');
 			ee()->logger->updater($log_message);
 
 			$db_updater->runStep($step);

From b54ca2f84f5af91c06142f1841cc97964c5a7747 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Fri, 3 Apr 2020 12:33:09 -0400
Subject: [PATCH 097/123] Added check if logger library is already loaded to
 fix edge-case issues

---
 .../Updater/Service/Updater/Runner.php                 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
index a453f7e16f..8e048e46bc 100644
--- a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
+++ b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/Runner.php
@@ -144,7 +144,10 @@ public function updateDatabase($step = NULL)
 			$this->makeLoggerService()->log($log_message);
 
 			// Legacy logger lib to log versions to update_log table
-			ee()->load->library('logger');
+			if (ee()->load->is_loaded('logger') === false) {
+				ee()->load->library('logger');
+			}
+			
 			ee()->logger->updater($log_message);
 
 			$db_updater->runStep($step);
@@ -213,7 +216,10 @@ public function selfDestruct($rollback = NULL)
 		$config->set('app_version', APP_VER, TRUE);
 
 		// Legacy logger lib to log to update_log table
-		ee()->load->library('logger');
+		if (ee()->load->is_loaded('logger') === false) {
+			ee()->load->library('logger');
+		}
+
 		ee()->logger->updater('Update complete. Now running version ' . APP_VER);
 
 		$working_dir = $this->makeUpdaterService()->path();

From da6409fccd00232e99052829d324980944b1451a Mon Sep 17 00:00:00 2001
From: Andy Mc <55093827+ops-andy@users.noreply.github.com>
Date: Fri, 3 Apr 2020 14:34:58 -0400
Subject: [PATCH 098/123] updated Readme file

updated content, dates, and for clarity on downloading.
---
 README.md | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dededd6cf4..da617afc46 100644
--- a/README.md
+++ b/README.md
@@ -17,17 +17,26 @@ ExpressionEngine _can_ run on PHP 5.6+ and MySQL 5.5.3+. For full details and a
 
 ## How To Install
 
+### If downloading from [expressionengine.com](https://expressionengine.com/)
 1. Create a database
-2. Upload the files
+2. Unzip download and upload the files to your site's root directory
 3. Verify file permissions
 4. Point your browser to `/admin.php` and run the Installation Wizard.
 
 Read [Installing ExpressionEngine](https://docs.expressionengine.com/latest/installation/installation.html) in the User Guide for full instructions, tips, and post-install best practices.
 
-Note: If you're installing from the repository, you will also need to:
+### If you're installing from the repository:
+1. Create a database
+2. Clone repo into your site's root directory or clone locally and upload files.
+3. Verify file permissions
+4. add an empty config file, e.g. `touch system/user/config/config.php`
+5. route requests to the installer app instead of the main app by changing `EE_INSTALL_MODE` to `TRUE` in [.env.php](.env.php). You can change this back when you're done.
+6. Point your browser to `/admin.php` and run the Installation Wizard.
+
+### Finding Previous Versions
+To install/download previous versions of ExpressionEngine navigate to [Releases](https://github.com/ExpressionEngine/ExpressionEngine/releases) and download the Source Code (.zip or .tar.gz) from the from the release you wish to download.
 
-- add an empty config file, e.g. `touch system/user/config/config.php`
-- route requests to the installer app instead of the main app by changing `EE_INSTALL_MODE` to `TRUE` in [.env.php](.env.php). You can change this back when you're done.
+*Note: You may need to follow the instructions above, "If you're installing from the repository", after downloading.*
 
 ## How to Get Started
 
@@ -45,12 +54,12 @@ There are many ways you get get involved and contribute to the ExpressionEngine
 
 ## Copyright / License Notice
 
-The ExpressionEngine project is copyright (c) 2003-2019 EllisLab, Inc ([https://ellislab.com](https://ellislab.com)) and is licensed under Apache License, Version 2.0. This project contains subcomponents with separate copyright and license terms, all of which are fully FOSS and compatible with Apache-2.0.
+The ExpressionEngine project is copyright (c) 2003-2020 Packet Tide, LLC ([https://packettide.com](https://packettide.com)) and is licensed under Apache License, Version 2.0. This project contains subcomponents with separate copyright and license terms, all of which are fully FOSS and compatible with Apache-2.0.
 
 Complete license terms and copyright information can be found in [LICENSE.txt](LICENSE.txt) in the root of this repository.
 
-"ExpressionEngine" is a registered trademark of EllisLab Corp. in the United States and around the world. Refer to EllisLab's [Trademark Use Policy](https://ellislab.com/trademark-use-policy) for access to logos and acceptable use.
+"ExpressionEngine" is a registered trademark of Packet Tide, LLC. in the United States and around the world. Refer to ExpressionEngines's [Trademark Use Policy](https://expressionengine.com/about/trademark-use-policy) for access to logos and acceptable use.
 
-> ![EECONF logo](https://eeconf.com/assets/img/logo-2019-red.png)
+> ![EECONF 2020](https://www.eeconf.com/uploads/general/eeconf-2020-logo-flyers-orange.png)
 >
-> The community powered EE CONF is coming to Minneapolis October 2-4. The conference features two days of top-notch speakers in two tracks plus four optional hands-on workshops. For more information visit [eeconf.com](https://eeconf.com)
+> The community powered EE CONF is coming to Philadelphia October 8-9. Join the ExpressionEngine community in a completely new and improved 2-day “summit” style conference in expert-led round table discussions to tackle your most challenging web development projects and business headaches. For more information visit [eeconf.com](https://eeconf.com)

From dccd8f74861925487bdb8b82aca19fbd013135e6 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Tue, 7 Apr 2020 19:47:54 +0300
Subject: [PATCH 099/123] fixes "Log file path not writable" error on Windows
 when using 1-click updater

---
 system/ee/installer/updater/boot.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/ee/installer/updater/boot.php b/system/ee/installer/updater/boot.php
index 0677044c3d..4e6e500e0a 100644
--- a/system/ee/installer/updater/boot.php
+++ b/system/ee/installer/updater/boot.php
@@ -30,6 +30,14 @@
 	}
 }
 
+// add EE constants
+$constants = require SYSPATH.'ee/EllisLab/ExpressionEngine/Config/constants.php';
+
+foreach ($constants as $k => $v) {
+	if ( ! defined($k)) {
+		define($k, $v);
+	}
+}
 
 /*
  * ------------------------------------------------------

From bcf031360234458ad80229bf32b75aff539229d9 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Wed, 8 Apr 2020 10:20:32 -0400
Subject: [PATCH 100/123] Fixed missing visibility on some methods. Reorganized
 methods based on visibility. PSR-12 updates. Fixes [EECORE-258]

---
 system/ee/legacy/libraries/Upload.php | 2088 ++++++++++++-------------
 1 file changed, 999 insertions(+), 1089 deletions(-)

diff --git a/system/ee/legacy/libraries/Upload.php b/system/ee/legacy/libraries/Upload.php
index d2a04e829e..bad977cb71 100644
--- a/system/ee/legacy/libraries/Upload.php
+++ b/system/ee/legacy/libraries/Upload.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This source file is part of the open source project
  * ExpressionEngine (https://expressionengine.com)
@@ -11,1116 +12,1025 @@
 /**
  * Core Upload
  */
-class EE_Upload {
-
-	public $max_size				= 0;
-	public $max_width				= 0;
-	public $max_height				= 0;
-	public $max_filename			= 0;
-	public $allowed_types			= "";
-	public $file_temp				= "";
-	public $file_name				= "";
-	public $orig_name				= "";
-	public $file_type				= "";
-	public $file_size				= "";
-	public $file_ext				= "";
-	public $upload_path				= "";
-	public $overwrite				= FALSE;
-	public $encrypt_name			= FALSE;
-	public $is_image				= FALSE;
-	public $image_width				= '';
-	public $image_height			= '';
-	public $image_type				= '';
-	public $image_size_str			= '';
-	public $error_msg				= array();
-	public $mimes					= array();
-	public $remove_spaces			= TRUE;
-	public $xss_clean				= FALSE;
-	public $temp_prefix				= "temp_file_";
-	public $client_name				= '';
-
-	protected $use_temp_dir			= FALSE;
-	protected $raw_upload = FALSE;
-	protected $_file_name_override	= '';
-	protected $blacklisted_extensions = array();
-
-	/**
-	 * Constructor
-	 */
-	function __construct($props = array())
-	{
-		if (count($props) > 0)
-		{
-			$this->initialize($props);
-		}
-
-		ee()->load->helper('xss');
-		ee()->load->helper('multibyte');
-
-		$props['xss_clean'] = xss_check();
-
-		$this->initialize($props);
-
-		ee()->load->library('mime_type');
-		log_message('debug', "Upload Class Initialized");
-
-		$this->blacklisted_extensions = array(
-			'php',
-			'php3',
-			'php4',
-			'php5',
-			'php7',
-			'phps',
-			'phtml'
-		);
-	}
-
-	/**
-	 * Take raw file data and populate our tmp directory and FILES array and
-	 * then pass it through the normal do_upload routine.
-	 *
-	 * @access	public
-	 * @param string $name The file name
-	 * @param string $type The mime type
-	 * @param string $data The raw file data
-	 * @return mixed The result of do_upload
-	 */
-	public function raw_upload($name, $data)
-	{
-		// This will force do_upload to skip its is_uploaded_file checks
-		$this->raw_upload = TRUE;
-
-		$tmp = tempnam(sys_get_temp_dir(), 'raw');
-
-		if (file_put_contents($tmp, $data) === FALSE)
-		{
-			throw new Exception('Could not upload file');
-		}
-
-		$_FILES['userfile'] = array(
-			'name' => $name,
-			'size' => ee_mb_strlen($data),
-			'tmp_name' => $tmp,
-			'error' => UPLOAD_ERR_OK
-		);
-
-		return $this->do_upload();
-	}
-
-	/**
-	 * Perform the file upload
-	 *
-	 * @return	bool
-	 */
-	public function do_upload($field = 'userfile')
-	{
-		// Is $_FILES[$field] set? If not, no reason to continue.
-		if ( ! isset($_FILES[$field]))
-		{
-			$this->set_error('upload_no_file_selected');
-			return FALSE;
-		}
-
-		// Is the upload path valid?
-		if ( ! $this->validate_upload_path())
-		{
-			// errors will already be set by validate_upload_path() so just return FALSE
-			return FALSE;
-		}
-
-		// Was the file able to be uploaded? If not, determine the reason why.
-		if ( ! $this->raw_upload && ! is_uploaded_file($_FILES[$field]['tmp_name']))
-		{
-			$error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
-
-			switch($error)
-			{
-				case 1:	// UPLOAD_ERR_INI_SIZE
-					$this->set_error('upload_file_exceeds_limit');
-					break;
-				case 2: // UPLOAD_ERR_FORM_SIZE
-					$this->set_error('upload_file_exceeds_form_limit');
-					break;
-				case 3: // UPLOAD_ERR_PARTIAL
-					$this->set_error('upload_file_partial');
-					break;
-				case 4: // UPLOAD_ERR_NO_FILE
-					$this->set_error('upload_no_file_selected');
-					break;
-				case 6: // UPLOAD_ERR_NO_TMP_DIR
-					$this->set_error('upload_no_temp_directory');
-					break;
-				case 7: // UPLOAD_ERR_CANT_WRITE
-					$this->set_error('upload_unable_to_write_file');
-					break;
-				case 8: // UPLOAD_ERR_EXTENSION
-					$this->set_error('upload_stopped_by_extension');
-					break;
-				default :   $this->set_error('upload_no_file_selected');
-					break;
-			}
-
-			return FALSE;
-		}
-
-		// Set the uploaded data as class variables
-		$this->file_temp = $_FILES[$field]['tmp_name'];
-		$this->file_size = $_FILES[$field]['size'];
-		$this->file_type = ee()->mime_type->ofFile($this->file_temp);
-		$this->file_name = $this->_prep_filename($_FILES[$field]['name']);
-		$this->file_ext	 = $this->get_extension($this->file_name);
-		$this->client_name = $this->file_name;
-
-		// Is this a hidden file? Not allowed
-		if (strncmp($this->file_name, '.', 1) == 0)
-		{
-			$this->set_error('upload_invalid_file');
-			return FALSE;
-		}
-
-		// Disallowed File Names
-		$disallowed_names = ee()->config->item('upload_file_name_blacklist');
-
-		if ($disallowed_names !== FALSE)
-		{
-			if ( ! is_array($disallowed_names))
-			{
-				$disallowed_names = array($disallowed_names);
-			}
-			$disallowed_names = array_map("strtolower", $disallowed_names);
-		}
-		else
-		{
-			$disallowed_names = array();
-		}
-
-		// Yes ".htaccess" is covered by the above hidden file check
-		// but this is here as an extra sanity-saving precation.
-		$disallowed_names[] = '.htaccess';
-		$disallowed_names[] = 'web.config';
-
-		if (in_array(strtolower($this->file_name), $disallowed_names))
-		{
-			$this->set_error('upload_invalid_file');
-			return FALSE;
-		}
-
-
-		// Is the file type allowed to be uploaded?
-		if ( ! $this->is_allowed_filetype())
-		{
-			$this->set_error('upload_invalid_file');
-			return FALSE;
-		}
-
-		// if we're overriding, let's now make sure the new name and type is allowed
-		if ($this->_file_name_override != '')
-		{
-			$this->file_name = $this->_prep_filename($this->_file_name_override);
-			$this->file_ext  = $this->get_extension($this->file_name);
-
-			if ( ! $this->is_allowed_filetype(TRUE))
-			{
-				$this->set_error('upload_invalid_file');
-				return FALSE;
-			}
-		}
-
-		// Convert the file size to kilobytes
-		if ($this->file_size > 0)
-		{
-			$this->file_size = round($this->file_size/1024, 2);
-		}
-
-		// Is the file size within the allowed maximum?
-		if ( ! $this->is_allowed_filesize())
-		{
-			$this->set_error('upload_invalid_filesize');
-			return FALSE;
-		}
-
-		// Are the image dimensions within the allowed size?
-		// Note: This can fail if the server has an open_basdir restriction.
-		if ( ! $this->is_allowed_dimensions())
-		{
-			$this->set_error('upload_invalid_dimensions');
-			return FALSE;
-		}
-
-		// Sanitize the file name for security
-		$this->file_name = $this->clean_file_name($this->file_name);
-
-		// Truncate the file name if it's too long
-		if ($this->max_filename > 0)
-		{
-			$this->file_name = $this->limit_filename_length($this->file_name, $this->max_filename);
-		}
-
-		// Remove white spaces in the name
-		if ($this->remove_spaces == TRUE)
-		{
-			$this->file_name = preg_replace("/\s+/", "_", $this->file_name);
-		}
-
-		/*
-		 * Validate the file name
-		 * This function appends an number onto the end of
-		 * the file if one with the same name already exists.
-		 * If it returns false there was a problem.
-		 */
-		$this->orig_name = $this->file_name;
-
-		if ($this->overwrite == FALSE)
-		{
-			$this->file_name = $this->set_filename($this->upload_path, $this->file_name);
-
-			if ($this->file_name === FALSE)
-			{
-				return FALSE;
-			}
-		}
-
-		/*
-		 * Run the file through the XSS hacking filter
-		 * This helps prevent malicious code from being
-		 * embedded within a file.  Scripts can easily
-		 * be disguised as images or other file types.
-		 */
-		if ($this->xss_clean)
-		{
-			if ($this->do_xss_clean() === FALSE)
-			{
-				$this->set_error('upload_unable_to_write_file');
-				return FALSE;
-			}
-		}
-
-		// If this is an image make sure it doesn't have PHP embedded in it
-		if ($this->is_image)
-		{
-			if ($this->do_embedded_php_check() === FALSE)
-			{
-				$this->set_error('upload_unable_to_write_file');
-				return FALSE;
-			}
-		}
-
-		/*
-		 * Move the file to the final destination
-		 * To deal with different server configurations
-		 * we'll attempt to use copy() first.  If that fails
-		 * we'll use move_uploaded_file().  One of the two should
-		 * reliably work in most environments
-		 */
-		if ( ! @copy($this->file_temp, $this->upload_path.$this->file_name))
-		{
-			if ( ! @move_uploaded_file($this->file_temp, $this->upload_path.$this->file_name))
-			{
-				$this->set_error('upload_destination_error');
-				return FALSE;
-			}
-		}
-
-		@chmod($this->upload_path.$this->file_name, FILE_WRITE_MODE);
-
-		/*
-		 * Set the finalized image dimensions
-		 * This sets the image width/height (assuming the
-		 * file was an image).  We use this information
-		 * in the "data" function.
-		 */
-		$this->set_image_properties($this->upload_path.$this->file_name);
-
-		return TRUE;
-	}
-
-	/**
-	 * Finalized Data Array
-	 *
-	 * Returns an associative array containing all of the information
-	 * related to the upload, allowing the developer easy access in one array.
-	 *
-	 * @return	array
-	 */
-	public function data()
-	{
-		return array (
-						'file_name'			=> $this->file_name,
-						'file_type'			=> $this->file_type,
-						'file_path'			=> $this->upload_path,
-						'full_path'			=> $this->upload_path.$this->file_name,
-						'raw_name'			=> str_replace($this->file_ext, '', $this->file_name),
-						'orig_name'			=> $this->orig_name,
-						'client_name'		=> $this->client_name,
-						'file_ext'			=> $this->file_ext,
-						'file_size'			=> $this->file_size,
-						'is_image'			=> $this->is_image(),
-						'image_width'		=> $this->image_width,
-						'image_height'		=> $this->image_height,
-						'image_type'		=> $this->image_type,
-						'image_size_str'	=> $this->image_size_str,
-					);
-	}
-
-	/**
-	 * Set Upload Path
-	 *
-	 * @param	string
-	 * @return	void
-	 */
-	public function set_upload_path($path)
-	{
-		// Make sure it has a trailing slash
-		$this->upload_path = rtrim($path, '/').'/';
-	}
-
-	/**
-	 * Set the file name
-	 *
-	 * This function takes a filename/path as input and looks for the
-	 * existence of a file with the same name. If found, it will append a
-	 * number to the end of the filename to avoid overwriting a pre-existing file.
-	 *
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	public function set_filename($path, $filename)
-	{
-		if ($this->encrypt_name == TRUE)
-		{
-			mt_srand();
-			$filename = md5(uniqid(mt_rand())).$this->file_ext;
-		}
-
-		if ( ! file_exists($path.$filename))
-		{
-			return $filename;
-		}
-
-		$new_filename = ee('Filesystem')->getUniqueFilename($path.$filename);
-		$new_filename = str_replace($path, '', $new_filename);
-
-		if ($new_filename == '')
-		{
-			$this->set_error('upload_bad_filename');
-			return FALSE;
-		}
-		else
-		{
-			return $new_filename;
-		}
-	}
-
-	/**
-	 * Set Maximum File Size
-	 *
-	 * @param	integer
-	 * @return	void
-	 */
-	public function set_max_filesize($n)
-	{
-		$this->max_size = ((int) $n < 0) ? 0: (int) $n;
-	}
-
-	/**
-	 * Set Maximum File Name Length
-	 *
-	 * @param	integer
-	 * @return	void
-	 */
-	public function set_max_filename($n)
-	{
-		$this->max_filename = ((int) $n < 0) ? 0: (int) $n;
-	}
-
-	/**
-	 * Set Maximum Image Width
-	 *
-	 * @param	integer
-	 * @return	void
-	 */
-	public function set_max_width($n)
-	{
-		$this->max_width = ((int) $n < 0) ? 0: (int) $n;
-	}
-
-	/**
-	 * Set Maximum Image Height
-	 *
-	 * @param	integer
-	 * @return	void
-	 */
-	public function set_max_height($n)
-	{
-		$this->max_height = ((int) $n < 0) ? 0: (int) $n;
-	}
-
-	/**
-	 * Set Allowed File Types
-	 *
-	 * @param	string
-	 * @return	void
-	 */
-	public function set_allowed_types($types)
-	{
-		if ( ! is_array($types) && $types == '*')
-		{
-			$this->allowed_types = '*';
-			return;
-		}
-		$this->allowed_types = explode('|', $types);
-	}
-
-	/**
-	 * Set Image Properties
-	 *
-	 * Uses GD to determine the width/height/type of image
-	 *
-	 * @param	string
-	 * @return	void
-	 */
-	public function set_image_properties($path = '')
-	{
-		if ( ! $this->is_image())
-		{
-			return;
-		}
-
-		if (function_exists('getimagesize'))
-		{
-			if (FALSE !== ($D = @getimagesize($path)))
-			{
-				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
-
-				$this->image_width		= $D['0'];
-				$this->image_height		= $D['1'];
-				$this->image_type		= ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
-				$this->image_size_str	= $D['3'];  // string containing height and width
-			}
-		}
-	}
-
-	/**
-	 * Set XSS Clean
-	 *
-	 * Enables the XSS flag so that the file that was uploaded
-	 * will be run through the XSS filter.
-	 *
-	 * @param	bool
-	 * @return	void
-	 */
-	public function set_xss_clean($flag = FALSE)
-	{
-		$this->xss_clean = ($flag == TRUE) ? TRUE : FALSE;
-	}
-
-	/**
-	 * Validate the image
-	 *
-	 * @return	bool
-	 */
-	public function is_image()
-	{
-		return ee()->mime_type->fileIsImage($this->file_temp);
-	}
-
-	/**
-	 * Verify that the filetype is allowed
-	 *
-	 * @return	bool
-	 */
-	public function is_allowed_filetype($ignore_mime = FALSE)
-	{
-		$ext = strtolower(ltrim($this->file_ext, '.'));
-
-		if (in_array($ext, $this->blacklisted_extensions))
-		{
-			return FALSE;
-		}
-
-		if ( ! empty($this->allowed_types) && is_array($this->allowed_types) && ! in_array($ext, $this->allowed_types))
-		{
-			return FALSE;
-		}
-
-		if ($ignore_mime === TRUE)
-		{
-			return TRUE;
-		}
-
-		if ($this->is_image)
-		{
-			return ee()->mime_type->fileIsImage($this->file_temp);
-		}
-
-		return ee()->mime_type->fileIsSafeForUpload($this->file_temp);
-	}
-
-	/**
-	 * Verify that the file is within the allowed size
-	 *
-	 * @return	bool
-	 */
-	public function is_allowed_filesize()
-	{
-		if ($this->max_size != 0  AND  $this->file_size > $this->max_size)
-		{
-			return FALSE;
-		}
-		else
-		{
-			return TRUE;
-		}
-	}
-
-	/**
-	 * Verify that the image is within the allowed width/height
-	 *
-	 * @return	bool
-	 */
-	public function is_allowed_dimensions()
-	{
-		if ( ! $this->is_image())
-		{
-			return TRUE;
-		}
-
-		if (function_exists('getimagesize'))
-		{
-			$D = @getimagesize($this->file_temp);
-
-			if ($this->max_width > 0 AND $D['0'] > $this->max_width)
-			{
-				return FALSE;
-			}
-
-			if ($this->max_height > 0 AND $D['1'] > $this->max_height)
-			{
-				return FALSE;
-			}
-
-			return TRUE;
-		}
-
-		return TRUE;
-	}
-
-	/**
-	 * Extract the file extension
-	 *
-	 * @param	string
-	 * @return	string
-	 */
-	public function get_extension($filename)
-	{
-		$x = explode('.', $filename);
-		return '.'.end($x);
-	}
-
-	/**
-	 * Clean the file name for security
-	 *
-	 * @param	string
-	 * @return	string
-	 */
-	public function clean_file_name($filename)
-	{
-		$bad = array(
-						"<!--",
-						"-->",
-						"'",
-						"<",
-						">",
-						'"',
-						'&',
-						'$',
-						'=',
-						';',
-						'?',
-						'/',
-						"%20",
-						"%22",
-						"%3c",		// <
-						"%253c",	// <
-						"%3e",		// >
-						"%0e",		// >
-						"%28",		// (
-						"%29",		// )
-						"%2528",	// (
-						"%26",		// &
-						"%24",		// $
-						"%3f",		// ?
-						"%3b",		// ;
-						"%3d"		// =
-					);
-
-		$filename = str_replace($bad, '', $filename);
-
-		return stripslashes($filename);
-	}
-
-	/**
-	 * Limit the File Name Length
-	 *
-	 * @param	string
-	 * @return	string
-	 */
-	public function limit_filename_length($filename, $length)
-	{
-		if (strlen($filename) < $length)
-		{
-			return $filename;
-		}
-
-		$ext = '';
-		if (strpos($filename, '.') !== FALSE)
-		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
-		}
-
-		return substr($filename, 0, ($length - strlen($ext))).$ext;
-	}
+class EE_Upload
+{
+
+    public $max_size                = 0;
+    public $max_width               = 0;
+    public $max_height              = 0;
+    public $max_filename            = 0;
+    public $allowed_types           = "";
+    public $file_temp               = "";
+    public $file_name               = "";
+    public $orig_name               = "";
+    public $file_type               = "";
+    public $file_size               = "";
+    public $file_ext                = "";
+    public $upload_path             = "";
+    public $overwrite               = false;
+    public $encrypt_name            = false;
+    public $is_image                = false;
+    public $image_width             = '';
+    public $image_height            = '';
+    public $image_type              = '';
+    public $image_size_str          = '';
+    public $error_msg               = array();
+    public $mimes                   = array();
+    public $remove_spaces           = true;
+    public $xss_clean               = false;
+    public $temp_prefix             = "temp_file_";
+    public $client_name             = '';
+
+    protected $use_temp_dir         = false;
+    protected $raw_upload = false;
+    protected $_file_name_override  = '';
+    protected $blacklisted_extensions = array();
 
     /**
-     * If possible, will increase PHP's memory limit by the specified number of
-     * bytes
+     * Constructor
+     */
+    public function __construct($props = array())
+    {
+        if (count($props) > 0) {
+            $this->initialize($props);
+        }
+
+        ee()->load->helper('xss');
+        ee()->load->helper('multibyte');
+
+        $props['xss_clean'] = xss_check();
+
+        $this->initialize($props);
+
+        ee()->load->library('mime_type');
+        log_message('debug', "Upload Class Initialized");
+
+        $this->blacklisted_extensions = array(
+            'php',
+            'php3',
+            'php4',
+            'php5',
+            'php7',
+            'phps',
+            'phtml'
+        );
+    }
+
+    /**
+     * Take raw file data and populate our tmp directory and FILES array and
+     * then pass it through the normal do_upload routine.
      *
-     * @param int $size The number of bytes in increase by
-     * @return void
+     * @access  public
+     * @param string $name The file name
+     * @param string $type The mime type
+     * @param string $data The raw file data
+     * @return mixed The result of do_upload
      */
-    protected function increase_memory_limit($size)
+    public function raw_upload($name, $data)
+    {
+        // This will force do_upload to skip its is_uploaded_file checks
+        $this->raw_upload = true;
+
+        $tmp = tempnam(sys_get_temp_dir(), 'raw');
+
+        if (file_put_contents($tmp, $data) === false) {
+            throw new Exception('Could not upload file');
+        }
+
+        $_FILES['userfile'] = array(
+            'name' => $name,
+            'size' => ee_mb_strlen($data),
+            'tmp_name' => $tmp,
+            'error' => UPLOAD_ERR_OK
+        );
+
+        return $this->do_upload();
+    }
+
+    /**
+     * Perform the file upload
+     *
+     * @return  bool
+     */
+    public function do_upload($field = 'userfile')
+    {
+        // Is $_FILES[$field] set? If not, no reason to continue.
+        if (! isset($_FILES[$field])) {
+            $this->set_error('upload_no_file_selected');
+            return false;
+        }
+
+        // Is the upload path valid?
+        if (! $this->validate_upload_path()) {
+            // errors will already be set by validate_upload_path() so just return FALSE
+            return false;
+        }
+
+        // Was the file able to be uploaded? If not, determine the reason why.
+        if (! $this->raw_upload && ! is_uploaded_file($_FILES[$field]['tmp_name'])) {
+            $error = ( ! isset($_FILES[$field]['error'])) ? 4 : $_FILES[$field]['error'];
+
+            switch ($error) {
+                case 1: // UPLOAD_ERR_INI_SIZE
+                    $this->set_error('upload_file_exceeds_limit');
+                    break;
+                case 2: // UPLOAD_ERR_FORM_SIZE
+                    $this->set_error('upload_file_exceeds_form_limit');
+                    break;
+                case 3: // UPLOAD_ERR_PARTIAL
+                    $this->set_error('upload_file_partial');
+                    break;
+                case 4: // UPLOAD_ERR_NO_FILE
+                    $this->set_error('upload_no_file_selected');
+                    break;
+                case 6: // UPLOAD_ERR_NO_TMP_DIR
+                    $this->set_error('upload_no_temp_directory');
+                    break;
+                case 7: // UPLOAD_ERR_CANT_WRITE
+                    $this->set_error('upload_unable_to_write_file');
+                    break;
+                case 8: // UPLOAD_ERR_EXTENSION
+                    $this->set_error('upload_stopped_by_extension');
+                    break;
+                default:
+                    $this->set_error('upload_no_file_selected');
+                    break;
+            }
+
+            return false;
+        }
+
+        // Set the uploaded data as class variables
+        $this->file_temp = $_FILES[$field]['tmp_name'];
+        $this->file_size = $_FILES[$field]['size'];
+        $this->file_type = ee()->mime_type->ofFile($this->file_temp);
+        $this->file_name = $this->_prep_filename($_FILES[$field]['name']);
+        $this->file_ext  = $this->get_extension($this->file_name);
+        $this->client_name = $this->file_name;
+
+        // Is this a hidden file? Not allowed
+        if (strncmp($this->file_name, '.', 1) == 0) {
+            $this->set_error('upload_invalid_file');
+            return false;
+        }
+
+        // Disallowed File Names
+        $disallowed_names = ee()->config->item('upload_file_name_blacklist');
+
+        if ($disallowed_names !== false) {
+            if (! is_array($disallowed_names)) {
+                $disallowed_names = array($disallowed_names);
+            }
+            $disallowed_names = array_map("strtolower", $disallowed_names);
+        } else {
+            $disallowed_names = array();
+        }
+
+        // Yes ".htaccess" is covered by the above hidden file check
+        // but this is here as an extra sanity-saving precation.
+        $disallowed_names[] = '.htaccess';
+        $disallowed_names[] = 'web.config';
+
+        if (in_array(strtolower($this->file_name), $disallowed_names)) {
+            $this->set_error('upload_invalid_file');
+            return false;
+        }
+
+        // Sanitize the file name for security
+        $this->file_name = $this->clean_file_name($this->file_name);
+
+        // Is the file type allowed to be uploaded?
+        if (! $this->is_allowed_filetype()) {
+            $this->set_error('upload_invalid_file');
+            return false;
+        }
+
+        // if we're overriding, let's now make sure the new name and type is allowed
+        if ($this->_file_name_override != '') {
+            $this->file_name = $this->_prep_filename($this->_file_name_override);
+            $this->file_ext  = $this->get_extension($this->file_name);
+
+            if (! $this->is_allowed_filetype(true)) {
+                $this->set_error('upload_invalid_file');
+                return false;
+            }
+        }
+
+        // Convert the file size to kilobytes
+        if ($this->file_size > 0) {
+            $this->file_size = round($this->file_size / 1024, 2);
+        }
+
+        // Is the file size within the allowed maximum?
+        if (! $this->is_allowed_filesize()) {
+            $this->set_error('upload_invalid_filesize');
+            return false;
+        }
+
+        // Are the image dimensions within the allowed size?
+        // Note: This can fail if the server has an open_basdir restriction.
+        if (! $this->is_allowed_dimensions()) {
+            $this->set_error('upload_invalid_dimensions');
+            return false;
+        }
+
+        // Truncate the file name if it's too long
+        if ($this->max_filename > 0) {
+            $this->file_name = $this->limit_filename_length($this->file_name, $this->max_filename);
+        }
+
+        // Remove white spaces in the name
+        if ($this->remove_spaces == true) {
+            $this->file_name = preg_replace("/\s+/", "_", $this->file_name);
+        }
+
+        /*
+         * Validate the file name
+         * This function appends an number onto the end of
+         * the file if one with the same name already exists.
+         * If it returns false there was a problem.
+         */
+        $this->orig_name = $this->file_name;
+
+        if ($this->overwrite == false) {
+            $this->file_name = $this->set_filename($this->upload_path, $this->file_name);
+
+            if ($this->file_name === false) {
+                return false;
+            }
+        }
+
+        /*
+         * Run the file through the XSS hacking filter
+         * This helps prevent malicious code from being
+         * embedded within a file.  Scripts can easily
+         * be disguised as images or other file types.
+         */
+        if ($this->xss_clean) {
+            if ($this->do_xss_clean() === false) {
+                $this->set_error('upload_unable_to_write_file');
+                return false;
+            }
+        }
+
+        // If this is an image make sure it doesn't have PHP embedded in it
+        if ($this->is_image) {
+            if ($this->do_embedded_php_check() === false) {
+                $this->set_error('upload_unable_to_write_file');
+                return false;
+            }
+        }
+
+        /*
+         * Move the file to the final destination
+         * To deal with different server configurations
+         * we'll attempt to use copy() first.  If that fails
+         * we'll use move_uploaded_file().  One of the two should
+         * reliably work in most environments
+         */
+        if (! @copy($this->file_temp, $this->upload_path . $this->file_name)) {
+            if (! @move_uploaded_file($this->file_temp, $this->upload_path . $this->file_name)) {
+                $this->set_error('upload_destination_error');
+                return false;
+            }
+        }
+
+        @chmod($this->upload_path . $this->file_name, FILE_WRITE_MODE);
+
+        /*
+         * Set the finalized image dimensions
+         * This sets the image width/height (assuming the
+         * file was an image).  We use this information
+         * in the "data" function.
+         */
+        $this->set_image_properties($this->upload_path . $this->file_name);
+
+        return true;
+    }
+
+    /**
+     * Finalized Data Array
+     *
+     * Returns an associative array containing all of the information
+     * related to the upload, allowing the developer easy access in one array.
+     *
+     * @return  array
+     */
+    public function data()
     {
-		if (function_exists('memory_get_usage') && memory_get_usage() && ini_get('memory_limit') != '')
-		{
-			$current = (int) ini_get('memory_limit') * 1024 * 1024;
-
-			// Because 1G is a thing
-			if (strtolower(substr(ini_get('memory_limit'), -1)) == 'g')
-			{
-				$current *= 1024;
-			}
-
-			// There was a bug/behavioural change in PHP 5.2, where numbers over
-			// one million get output into scientific notation.  number_format()
-			// ensures this number is an integer
-			// http://bugs.php.net/bug.php?id=43053
-
-			$new_memory = number_format(ceil($size + $current), 0, '.', '');
-
-			// When an integer is used, the value is measured in bytes.
-			ini_set('memory_limit', $new_memory);
-		}
+        return array (
+                        'file_name'         => $this->file_name,
+                        'file_type'         => $this->file_type,
+                        'file_path'         => $this->upload_path,
+                        'full_path'         => $this->upload_path . $this->file_name,
+                        'raw_name'          => str_replace($this->file_ext, '', $this->file_name),
+                        'orig_name'         => $this->orig_name,
+                        'client_name'       => $this->client_name,
+                        'file_ext'          => $this->file_ext,
+                        'file_size'         => $this->file_size,
+                        'is_image'          => $this->is_image(),
+                        'image_width'       => $this->image_width,
+                        'image_height'      => $this->image_height,
+                        'image_type'        => $this->image_type,
+                        'image_size_str'    => $this->image_size_str,
+                    );
     }
 
-	/**
-	 * Runs the file through the XSS clean function
-	 *
-	 * This prevents people from embedding malicious code in their files.
-	 * I'm not sure that it won't negatively affect certain files in unexpected ways,
-	 * but so far I haven't found that it causes trouble.
-	 *
-	 * @return	void
-	 */
-	public function do_xss_clean()
-	{
-		$file = $this->file_temp;
-
-		if (filesize($file) == 0)
-		{
-			return FALSE;
-		}
+    /**
+     * Set Upload Path
+     *
+     * @param   string
+     * @return  void
+     */
+    public function set_upload_path($path)
+    {
+        // Make sure it has a trailing slash
+        $this->upload_path = rtrim($path, '/') . '/';
+    }
+
+    /**
+     * Set the file name
+     *
+     * This function takes a filename/path as input and looks for the
+     * existence of a file with the same name. If found, it will append a
+     * number to the end of the filename to avoid overwriting a pre-existing file.
+     *
+     * @param   string
+     * @param   string
+     * @return  string
+     */
+    public function set_filename($path, $filename)
+    {
+        if ($this->encrypt_name == true) {
+            mt_srand();
+            $filename = md5(uniqid(mt_rand())) . $this->file_ext;
+        }
+
+        if (! file_exists($path . $filename)) {
+            return $filename;
+        }
+
+        $new_filename = ee('Filesystem')->getUniqueFilename($path . $filename);
+        $new_filename = str_replace($path, '', $new_filename);
+
+        if ($new_filename == '') {
+            $this->set_error('upload_bad_filename');
+            return false;
+        } else {
+            return $new_filename;
+        }
+    }
+
+    /**
+     * Set Maximum File Size
+     *
+     * @param   integer
+     * @return  void
+     */
+    public function set_max_filesize($n)
+    {
+        $this->max_size = ((int) $n < 0) ? 0 : (int) $n;
+    }
+
+    /**
+     * Set Maximum File Name Length
+     *
+     * @param   integer
+     * @return  void
+     */
+    public function set_max_filename($n)
+    {
+        $this->max_filename = ((int) $n < 0) ? 0 : (int) $n;
+    }
+
+    /**
+     * Set Maximum Image Width
+     *
+     * @param   integer
+     * @return  void
+     */
+    public function set_max_width($n)
+    {
+        $this->max_width = ((int) $n < 0) ? 0 : (int) $n;
+    }
+
+    /**
+     * Set Maximum Image Height
+     *
+     * @param   integer
+     * @return  void
+     */
+    public function set_max_height($n)
+    {
+        $this->max_height = ((int) $n < 0) ? 0 : (int) $n;
+    }
+
+    /**
+     * Set Allowed File Types
+     *
+     * @param   string
+     * @return  void
+     */
+    public function set_allowed_types($types)
+    {
+        if (! is_array($types) && $types == '*') {
+            $this->allowed_types = '*';
+            return;
+        }
+        $this->allowed_types = explode('|', $types);
+    }
+
+    /**
+     * Set Image Properties
+     *
+     * Uses GD to determine the width/height/type of image
+     *
+     * @param   string
+     * @return  void
+     */
+    public function set_image_properties($path = '')
+    {
+        if (! $this->is_image()) {
+            return;
+        }
+
+        if (function_exists('getimagesize')) {
+            if (false !== ($D = @getimagesize($path))) {
+                $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
+
+                $this->image_width      = $D['0'];
+                $this->image_height     = $D['1'];
+                $this->image_type       = ( ! isset($types[$D['2']])) ? 'unknown' : $types[$D['2']];
+                $this->image_size_str   = $D['3'];  // string containing height and width
+            }
+        }
+    }
+
+    /**
+     * Set XSS Clean
+     *
+     * Enables the XSS flag so that the file that was uploaded
+     * will be run through the XSS filter.
+     *
+     * @param   bool
+     * @return  void
+     */
+    public function set_xss_clean($flag = false)
+    {
+        $this->xss_clean = ($flag == true) ? true : false;
+    }
+
+    /**
+     * Validate the image
+     *
+     * @return  bool
+     */
+    public function is_image()
+    {
+        return ee()->mime_type->fileIsImage($this->file_temp);
+    }
+
+    /**
+     * Verify that the filetype is allowed
+     *
+     * @return  bool
+     */
+    public function is_allowed_filetype($ignore_mime = false)
+    {
+        $ext = strtolower(ltrim($this->file_ext, '.'));
+
+        if (in_array($ext, $this->blacklisted_extensions)) {
+            return false;
+        }
+
+        if (! empty($this->allowed_types) && is_array($this->allowed_types) && ! in_array($ext, $this->allowed_types)) {
+            return false;
+        }
+
+        if ($ignore_mime === true) {
+            return true;
+        }
+
+        if ($this->is_image) {
+            return ee()->mime_type->fileIsImage($this->file_temp);
+        }
+
+        return ee()->mime_type->fileIsSafeForUpload($this->file_temp);
+    }
+
+    /**
+     * Verify that the file is within the allowed size
+     *
+     * @return  bool
+     */
+    public function is_allowed_filesize()
+    {
+        if ($this->max_size != 0 && $this->file_size > $this->max_size) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Verify that the image is within the allowed width/height
+     *
+     * @return  bool
+     */
+    public function is_allowed_dimensions()
+    {
+        if (! $this->is_image()) {
+            return true;
+        }
+
+        if (function_exists('getimagesize')) {
+            $D = @getimagesize($this->file_temp);
+
+            if ($this->max_width > 0 && $D['0'] > $this->max_width) {
+                return false;
+            }
+
+            if ($this->max_height > 0 && $D['1'] > $this->max_height) {
+                return false;
+            }
+
+            return true;
+        }
+
+        return true;
+    }
+
+    /**
+     * Extract the file extension
+     *
+     * @param   string
+     * @return  string
+     */
+    public function get_extension($filename)
+    {
+        $x = explode('.', $filename);
+        return '.' . end($x);
+    }
+
+    /**
+     * Clean the file name for security
+     *
+     * @param   string
+     * @return  string
+     */
+    public function clean_file_name($filename)
+    {
+        $bad = array(
+                        "<!--",
+                        "-->",
+                        "'",
+                        "<",
+                        ">",
+                        '"',
+                        '&',
+                        '$',
+                        '=',
+                        ';',
+                        '?',
+                        '/',
+                        "%20",
+                        "%22",
+                        "%3c",      // <
+                        "%253c",    // <
+                        "%3e",      // >
+                        "%0e",      // >
+                        "%28",      // (
+                        "%29",      // )
+                        "%2528",    // (
+                        "%26",      // &
+                        "%24",      // $
+                        "%3f",      // ?
+                        "%3b",      // ;
+                        "%3d"       // =
+                    );
+
+        $filename = str_replace($bad, '_', $filename);
+
+        return stripslashes($filename);
+    }
+
+    /**
+     * Limit the File Name Length
+     *
+     * @param   string
+     * @return  string
+     */
+    public function limit_filename_length($filename, $length)
+    {
+        if (strlen($filename) < $length) {
+            return $filename;
+        }
+
+        $ext = '';
+        if (strpos($filename, '.') !== false) {
+            $parts      = explode('.', $filename);
+            $ext        = '.' . array_pop($parts);
+            $filename   = implode('.', $parts);
+        }
+
+        return substr($filename, 0, ($length - strlen($ext))) . $ext;
+    }
+
+    /**
+     * Runs the file through the XSS clean function
+     *
+     * This prevents people from embedding malicious code in their files.
+     * I'm not sure that it won't negatively affect certain files in unexpected ways,
+     * but so far I haven't found that it causes trouble.
+     *
+     * @return  void
+     */
+    public function do_xss_clean()
+    {
+        $file = $this->file_temp;
+
+        if (filesize($file) == 0) {
+            return false;
+        }
 
         $this->increase_memory_limit(filesize($file));
 
-		// If the file being uploaded is an image, then we should have no
-		// problem with XSS attacks (in theory), but IE can be fooled into mime-
-		// type detecting a malformed image as an html file, thus executing an
-		// XSS attack on anyone using IE who looks at the image.  It does this
-		// by inspecting the first 255 bytes of an image.  To get around this CI
-		// will itself look at the first 255 bytes of an image to determine its
-		// relative safety.  This can save a lot of processor power and time if
-		// it is actually a clean image, as it will be in nearly all instances
-		// _except_ an attempted XSS attack.
-
-		if (function_exists('getimagesize') && ($image = getimagesize($file)) !== FALSE)
-		{
-			if (ee()->mime_type->fileIsSafeForUpload($file) === FALSE)
-			{
-				return FALSE; // tricky tricky
-			}
-
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
-			{
-				return FALSE; // Couldn't open the file, return FALSE
-			}
-
-			$opening_bytes = fread($file, 256);
-			fclose($file);
-
-			// These are known to throw IE into mime-type detection chaos <a,
-			// <body, <head, <html, <img, <plaintext, <pre, <script, <table,
-			// <title
-			// title is basically just in SVG, but we filter it anyhow
-
-			if ( ! preg_match('/<(a|body|head|html|img|plaintext|pre|script|table|title)[\s>]/i', $opening_bytes))
-			{
-				return TRUE; // its an image, no "triggers" detected in the first 256 bytes, we're good
-			}
-			else
-			{
-				return FALSE;
-			}
-		}
-
-		if (($data = @file_get_contents($file)) === FALSE)
-		{
-			return FALSE;
-		}
-
-		return ee('Security/XSS')->clean($data, TRUE);
-	}
-
-	public function do_embedded_php_check()
-	{
-		$file = $this->file_temp;
-
-		if (filesize($file) == 0)
-		{
-			return FALSE;
-		}
+        // If the file being uploaded is an image, then we should have no
+        // problem with XSS attacks (in theory), but IE can be fooled into mime-
+        // type detecting a malformed image as an html file, thus executing an
+        // XSS attack on anyone using IE who looks at the image.  It does this
+        // by inspecting the first 255 bytes of an image.  To get around this CI
+        // will itself look at the first 255 bytes of an image to determine its
+        // relative safety.  This can save a lot of processor power and time if
+        // it is actually a clean image, as it will be in nearly all instances
+        // _except_ an attempted XSS attack.
+
+        if (function_exists('getimagesize') && ($image = getimagesize($file)) !== false) {
+            if (ee()->mime_type->fileIsSafeForUpload($file) === false) {
+                return false; // tricky tricky
+            }
+
+            if (($file = @fopen($file, 'rb')) === false) { // "b" to force binary
+                return false; // Couldn't open the file, return FALSE
+            }
+
+            $opening_bytes = fread($file, 256);
+            fclose($file);
+
+            // These are known to throw IE into mime-type detection chaos <a,
+            // <body, <head, <html, <img, <plaintext, <pre, <script, <table,
+            // <title
+            // title is basically just in SVG, but we filter it anyhow
+
+            if (! preg_match('/<(a|body|head|html|img|plaintext|pre|script|table|title)[\s>]/i', $opening_bytes)) {
+                return true; // its an image, no "triggers" detected in the first 256 bytes, we're good
+            } else {
+                return false;
+            }
+        }
+
+        if (($data = @file_get_contents($file)) === false) {
+            return false;
+        }
+
+        return ee('Security/XSS')->clean($data, true);
+    }
+
+    public function do_embedded_php_check()
+    {
+        $file = $this->file_temp;
+
+        if (filesize($file) == 0) {
+            return false;
+        }
 
         $this->increase_memory_limit(filesize($file));
 
-		if (($data = @file_get_contents($file)) === FALSE)
-		{
-			return FALSE;
-		}
-
-		// We can't simply check for `<?` because that's valid XML and is
-		// allowed in files.
-		return (stripos($data, '<?php') === FALSE);
-	}
-
-	/**
-	 * Set an error message
-	 *
-	 * @param	string
-	 * @return	void
-	 */
-	public function set_error($msg)
-	{
-		ee()->lang->load('upload');
-
-		if (is_array($msg))
-		{
-			foreach ($msg as $val)
-			{
-				$msg = (ee()->lang->line($val) == FALSE) ? $val : ee()->lang->line($val);
-				$this->error_msg[] = $msg;
-				log_message('error', $msg);
-			}
-		}
-		else
-		{
-			$msg = (ee()->lang->line($msg) == FALSE) ? $msg : ee()->lang->line($msg);
-			$this->error_msg[] = $msg;
-			log_message('error', $msg);
-		}
-	}
-
-	/**
-	 * Display the error message
-	 *
-	 * @param	string
-	 * @param	string
-	 * @return	string
-	 */
-	public function display_errors($open = '<p>', $close = '</p>')
-	{
-		$str = '';
-		foreach ($this->error_msg as $val)
-		{
-			$str .= $open.$val.$close;
-		}
-
-		return $str;
-	}
-
-	/**
-	 * List of Mime Types
-	 *
-	 * This is a list of mime types.  We use it to validate
-	 * the "allowed types" set by the developer
-	 *
-	 * @param	string
-	 * @return	string
-	 */
-	public function mimes_types($mime)
-	{
-		ee()->load->library('mime_type');
-		return ee()->mime_type->isSafeForUpload($mime);
-	}
-
-	/**
-	 * Prep Filename
-	 *
-	 * Prevents possible script execution from Apache's handling of files multiple extensions
-	 * http://httpd.apache.org/docs/1.3/mod/mod_mime.html#multipleext
-	 *
-	 * @param	string
-	 * @return	string
-	 */
-	protected function _prep_filename($filename)
-	{
-		if (strpos($filename, '.') === FALSE OR $this->allowed_types == '*')
-		{
-			return $filename;
-		}
-
-		$parts		= explode('.', $filename);
-		$ext		= array_pop($parts);
-		$filename	= array_shift($parts);
-
-		foreach ($parts as $part)
-		{
-			$filename .= '.'.$part;
-
-			if ( ! $this->allowedType($part))
-			{
-				$filename .= '_';
-			}
-		}
-
-		$filename .= '.'.$ext;
-
-		return $filename;
-	}
-
-	private function allowedType($extension)
-	{
-		// numbers by themselves are safe, e.g. file_3.2.5.txt, as are concurrent...dots
-		if (ctype_digit($extension) OR $extension == '')
-		{
-			return TRUE;
-		}
-
-		$by_legacy = FALSE;
-		$extension = strtolower($extension);
-
-		if (is_array($this->allowed_types))
-		{
-			$by_legacy = in_array($extension, $this->allowed_types);
-		}
-
-		return ($by_legacy OR $this->mimes_types($extension));
-	}
-
-	/**
-	 * Overwrite OR Rename Files Manually
-	 *
-	 * @access	public
-	 * @param string $original_files Path to the original file
-	 * @param string $new The new file name
-	 * @param boolean $type_match Should we make sure the extensions match?
-	 * @return boolean TRUE if it was renamed properly, FALSE otherwise
-	 */
-   function file_overwrite($original_file = '', $new = '', $type_match = TRUE)
-	{
-		$this->file_name = $new;
-
-		// If renaming a file, it should have same file type suffix as the original
-		if ($type_match === TRUE)
-		{
-			$filename_parts = explode('.', $this->file_name);
-			$original_parts = explode('.', $original_file);
-
-			if (sizeof($filename_parts) == 1 OR (array_pop($filename_parts) != array_pop($original_parts)))
-			{
-				$this->set_error('invalid_filetype');
-				return FALSE;
-			}
-		}
-
-		if ($this->remove_spaces == 1)
-		{
-			$this->file_name = preg_replace("/\s+/", "_", $this->file_name);
-			$original_file = preg_replace("/\s+/", "_", $original_file);
-		}
-
-		// Check to make sure the file doesn't already exist
-		if (file_exists($this->upload_path . $this->file_name))
-		{
-			$this->set_error('file_exists');
-			return FALSE;
-		}
-
-		if ( ! @copy($this->upload_path.$original_file, $this->upload_path.$this->file_name))
-		{
-			$this->set_error('copy_error');
-			return FALSE;
-		}
-
-		unlink ($this->upload_path.$original_file);
-
-		return TRUE;
-	}
-
-	/**
-	 * Validate Upload Path
-	 *
-	 * Verifies that it is a valid upload path with proper permissions.
-	 *
-	 * @access	public
-	 */
-	public function validate_upload_path()
-	{
-		if ($this->use_temp_dir)
-		{
-			$path = $this->_discover_temp_path();
-
-			if ($path)
-			{
-				$this->upload_path = $path;
-			}
-			else
-			{
-				$this->set_error('No usable temp directory found.');
-				return FALSE;
-			}
-		}
-
-		if ($this->upload_path == '')
-		{
-			$this->set_error('upload_no_filepath');
-			return FALSE;
-		}
-
-		if (function_exists('realpath') AND @realpath($this->upload_path) !== FALSE)
-		{
-			$this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
-		}
-
-		if ( ! @is_dir($this->upload_path))
-		{
-			$this->set_error('upload_no_filepath');
-			return FALSE;
-		}
-
-		if ( ! is_really_writable($this->upload_path))
-		{
-			$this->set_error('upload_not_writable');
-			return FALSE;
-		}
-
-		$this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/",  $this->upload_path);
-		return TRUE;
-	}
-
-	/**
-	 * Keep the file in the temp directory?
-	 *
-	 * @access	public
-	 */
-	public function initialize($config = array())
-	{
-		if (isset($config['use_temp_dir']) && $config['use_temp_dir'] === TRUE)
-		{
-			$this->use_temp_dir = TRUE;
-		}
-		else
-		{
-			$this->use_temp_dir = FALSE;
-		}
-
-		$defaults = array(
-							'max_size'			=> 0,
-							'max_width'			=> 0,
-							'max_height'		=> 0,
-							'max_filename'		=> 0,
-							'allowed_types'		=> "",
-							'file_temp'			=> "",
-							'file_name'			=> "",
-							'orig_name'			=> "",
-							'file_type'			=> "",
-							'file_size'			=> "",
-							'file_ext'			=> "",
-							'upload_path'		=> "",
-							'overwrite'			=> FALSE,
-							'encrypt_name'		=> FALSE,
-							'is_image'			=> FALSE,
-							'image_width'		=> '',
-							'image_height'		=> '',
-							'image_type'		=> '',
-							'image_size_str'	=> '',
-							'error_msg'			=> array(),
-							'mimes'				=> array(),
-							'remove_spaces'		=> TRUE,
-							'xss_clean'			=> FALSE,
-							'temp_prefix'		=> "temp_file_",
-							'client_name'		=> ''
-						);
-
-
-		foreach ($defaults as $key => $val)
-		{
-			if (isset($config[$key]))
-			{
-				$method = 'set_'.$key;
-				if (method_exists($this, $method))
-				{
-					$this->$method($config[$key]);
-				}
-				else
-				{
-					$this->$key = $config[$key];
-				}
-			}
-			else
-			{
-				$this->$key = $val;
-			}
-		}
-
-		// if a file_name was provided in the config, use it instead of the user input
-		// supplied file name for all uploads until initialized again
-		$this->_file_name_override = $this->file_name;
-	}
-
-	/**
-	 * Find a valid temp directory?
-	 *
-	 * @access	public
-	 */
-	public function _discover_temp_path()
-	{
-		$attempt = array();
+        if (($data = @file_get_contents($file)) === false) {
+            return false;
+        }
+
+        // We can't simply check for `<?` because that's valid XML and is
+        // allowed in files.
+        return (stripos($data, '<?php') === false);
+    }
+
+    /**
+     * Set an error message
+     *
+     * @param   string
+     * @return  void
+     */
+    public function set_error($msg)
+    {
+        ee()->lang->load('upload');
+
+        if (is_array($msg)) {
+            foreach ($msg as $val) {
+                $msg = (ee()->lang->line($val) == false) ? $val : ee()->lang->line($val);
+                $this->error_msg[] = $msg;
+                log_message('error', $msg);
+            }
+        } else {
+            $msg = (ee()->lang->line($msg) == false) ? $msg : ee()->lang->line($msg);
+            $this->error_msg[] = $msg;
+            log_message('error', $msg);
+        }
+    }
+
+    /**
+     * Display the error message
+     *
+     * @param   string
+     * @param   string
+     * @return  string
+     */
+    public function display_errors($open = '<p>', $close = '</p>')
+    {
+        $str = '';
+        foreach ($this->error_msg as $val) {
+            $str .= $open . $val . $close;
+        }
+
+        return $str;
+    }
+
+    /**
+     * List of Mime Types
+     *
+     * This is a list of mime types.  We use it to validate
+     * the "allowed types" set by the developer
+     *
+     * @param   string
+     * @return  string
+     */
+    public function mimes_types($mime)
+    {
+        ee()->load->library('mime_type');
+        return ee()->mime_type->isSafeForUpload($mime);
+    }
+
+    /**
+     * Overwrite OR Rename Files Manually
+     *
+     * @access  public
+     * @param string $original_files Path to the original file
+     * @param string $new The new file name
+     * @param boolean $type_match Should we make sure the extensions match?
+     * @return boolean TRUE if it was renamed properly, FALSE otherwise
+     */
+    public function file_overwrite($original_file = '', $new = '', $type_match = true)
+    {
+        $this->file_name = $new;
+
+        // If renaming a file, it should have same file type suffix as the original
+        if ($type_match === true) {
+            $filename_parts = explode('.', $this->file_name);
+            $original_parts = explode('.', $original_file);
+
+            if (sizeof($filename_parts) == 1 || (array_pop($filename_parts) != array_pop($original_parts))) {
+                $this->set_error('invalid_filetype');
+                return false;
+            }
+        }
+
+        if ($this->remove_spaces == 1) {
+            $this->file_name = preg_replace("/\s+/", "_", $this->file_name);
+            $original_file = preg_replace("/\s+/", "_", $original_file);
+        }
+
+        // Check to make sure the file doesn't already exist
+        if (file_exists($this->upload_path . $this->file_name)) {
+            $this->set_error('file_exists');
+            return false;
+        }
+
+        if (! @copy($this->upload_path . $original_file, $this->upload_path . $this->file_name)) {
+            $this->set_error('copy_error');
+            return false;
+        }
+
+        unlink($this->upload_path . $original_file);
+
+        return true;
+    }
+
+    /**
+     * Validate Upload Path
+     *
+     * Verifies that it is a valid upload path with proper permissions.
+     *
+     * @access  public
+     */
+    public function validate_upload_path()
+    {
+        if ($this->use_temp_dir) {
+            $path = $this->_discover_temp_path();
+
+            if ($path) {
+                $this->upload_path = $path;
+            } else {
+                $this->set_error('No usable temp directory found.');
+                return false;
+            }
+        }
+
+        if ($this->upload_path == '') {
+            $this->set_error('upload_no_filepath');
+            return false;
+        }
+
+        if (function_exists('realpath') && @realpath($this->upload_path) !== false) {
+            $this->upload_path = str_replace("\\", "/", realpath($this->upload_path));
+        }
+
+        if (! @is_dir($this->upload_path)) {
+            $this->set_error('upload_no_filepath');
+            return false;
+        }
+
+        if (! is_really_writable($this->upload_path)) {
+            $this->set_error('upload_not_writable');
+            return false;
+        }
+
+        $this->upload_path = preg_replace("/(.+?)\/*$/", "\\1/", $this->upload_path);
+        return true;
+    }
+
+    /**
+     * Keep the file in the temp directory?
+     *
+     * @access  public
+     */
+    public function initialize($config = array())
+    {
+        if (isset($config['use_temp_dir']) && $config['use_temp_dir'] === true) {
+            $this->use_temp_dir = true;
+        } else {
+            $this->use_temp_dir = false;
+        }
+
+        $defaults = array(
+                            'max_size'          => 0,
+                            'max_width'         => 0,
+                            'max_height'        => 0,
+                            'max_filename'      => 0,
+                            'allowed_types'     => "",
+                            'file_temp'         => "",
+                            'file_name'         => "",
+                            'orig_name'         => "",
+                            'file_type'         => "",
+                            'file_size'         => "",
+                            'file_ext'          => "",
+                            'upload_path'       => "",
+                            'overwrite'         => false,
+                            'encrypt_name'      => false,
+                            'is_image'          => false,
+                            'image_width'       => '',
+                            'image_height'      => '',
+                            'image_type'        => '',
+                            'image_size_str'    => '',
+                            'error_msg'         => array(),
+                            'mimes'             => array(),
+                            'remove_spaces'     => true,
+                            'xss_clean'         => false,
+                            'temp_prefix'       => "temp_file_",
+                            'client_name'       => ''
+                        );
+
+
+        foreach ($defaults as $key => $val) {
+            if (isset($config[$key])) {
+                $method = 'set_' . $key;
+                if (method_exists($this, $method)) {
+                    $this->$method($config[$key]);
+                } else {
+                    $this->$key = $config[$key];
+                }
+            } else {
+                $this->$key = $val;
+            }
+        }
+
+        // if a file_name was provided in the config, use it instead of the user input
+        // supplied file name for all uploads until initialized again
+        $this->_file_name_override = $this->file_name;
+    }
+
+    /**
+     * Find a valid temp directory?
+     *
+     * @access  public
+     */
+    public function _discover_temp_path()
+    {
+        $attempt = array();
         $ini_path = ini_get('upload_tmp_dir');
 
-        if ($ini_path)
-        {
+        if ($ini_path) {
             $attempt[] = realpath($ini_path);
         }
 
-		$attempt[] = sys_get_temp_dir();
-		$attempt[] = @getenv('TMP');
-		$attempt[] = @getenv('TMPDIR');
-		$attempt[] = @getenv('TEMP');
+        $attempt[] = sys_get_temp_dir();
+        $attempt[] = @getenv('TMP');
+        $attempt[] = @getenv('TMPDIR');
+        $attempt[] = @getenv('TEMP');
 
-		$valid_temps = array_filter($attempt);	// remove false's
+        $valid_temps = array_filter($attempt);  // remove false's
 
-		foreach ($valid_temps as $dir)
-		{
-			if (is_readable($dir) && is_writable($dir))
-			{
-				return $dir;
-			}
-		}
+        foreach ($valid_temps as $dir) {
+            if (is_readable($dir) && is_writable($dir)) {
+                return $dir;
+            }
+        }
 
-		return FALSE;
-	}
+        return false;
+    }
+
+    /**
+     * If possible, will increase PHP's memory limit by the specified number of
+     * bytes
+     *
+     * @param int $size The number of bytes in increase by
+     * @return void
+     */
+    protected function increase_memory_limit($size)
+    {
+        if (function_exists('memory_get_usage') && memory_get_usage() && ini_get('memory_limit') != '') {
+            $current = (int) ini_get('memory_limit') * 1024 * 1024;
+
+            // Because 1G is a thing
+            if (strtolower(substr(ini_get('memory_limit'), -1)) == 'g') {
+                $current *= 1024;
+            }
+
+            // There was a bug/behavioural change in PHP 5.2, where numbers over
+            // one million get output into scientific notation.  number_format()
+            // ensures this number is an integer
+            // http://bugs.php.net/bug.php?id=43053
+
+            $new_memory = number_format(ceil($size + $current), 0, '.', '');
+
+            // When an integer is used, the value is measured in bytes.
+            ini_set('memory_limit', $new_memory);
+        }
+    }
+
+    /**
+     * Prep Filename
+     *
+     * Prevents possible script execution from Apache's handling of files multiple extensions
+     * http://httpd.apache.org/docs/1.3/mod/mod_mime.html#multipleext
+     *
+     * @param   string
+     * @return  string
+     */
+    protected function _prep_filename($filename)
+    {
+        if (strpos($filename, '.') === false || $this->allowed_types == '*') {
+            return $filename;
+        }
+
+        $parts      = explode('.', $filename);
+        $ext        = array_pop($parts);
+        $filename   = array_shift($parts);
+
+        foreach ($parts as $part) {
+            $filename .= '.' . $part;
+
+            if (! $this->allowedType($part)) {
+                $filename .= '_';
+            }
+        }
+
+        $filename .= '.' . $ext;
+
+        return $filename;
+    }
+
+    /**
+     * Checks if the file's mime_type is allowed.
+     *
+     * @param string $extension
+     * @return bool
+     */
+    private function allowedType($extension)
+    {
+        // numbers by themselves are safe, e.g. file_3.2.5.txt, as are concurrent...dots
+        if (ctype_digit($extension) || $extension == '') {
+            return true;
+        }
+
+        $by_legacy = false;
+        $extension = strtolower($extension);
+
+        if (is_array($this->allowed_types)) {
+            $by_legacy = in_array($extension, $this->allowed_types);
+        }
+
+        return ($by_legacy || $this->mimes_types($extension));
+    }
 }
 // END CLASS
 

From 226de6ce27876932737b05843fab244f2943b91b Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Thu, 9 Apr 2020 10:39:58 -0400
Subject: [PATCH 101/123] Added fix for path slash issue on Windows

---
 .../ExpressionEngine/Updater/Service/Updater/FileUpdater.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
index 74197e2157..5b49626227 100644
--- a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
+++ b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
@@ -244,6 +244,9 @@ protected function move($source, $destination, Array $exclusions = [], $copy = F
 
 		$contents = $this->filesystem->getDirectoryContents($source);
 
+		$source = str_replace("\\", "/", $source);
+		$destination = str_replace("\\", "/", $destination);
+
 		foreach ($contents as $path)
 		{
 			// Skip exclusions and .DS_Store
@@ -252,6 +255,8 @@ protected function move($source, $destination, Array $exclusions = [], $copy = F
 				continue;
 			}
 
+			$path = str_replace("\\", "/", $path);
+
 			$new_path = str_replace($source, $destination, $path);
 
 			// Try to catch permissions errors before PHP's file I/O functions do

From 0ee549df25185c068f85bf02c0658f7d69e2c28f Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Thu, 9 Apr 2020 15:16:03 -0400
Subject: [PATCH 102/123] Prep changelogs for release

---
 changelogs/minor.md |  2 ++
 changelogs/patch.md | 13 ++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index 09344b8678..dee6b3d4ad 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -5,6 +5,8 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Minor Release
 
 Bullet list below, e.g.
+   - Added <new feature>
+   - Fixed a bug (#<linked issue number>) where <bug behavior>.
 
 
 
diff --git a/changelogs/patch.md b/changelogs/patch.md
index edd26bc83d..3aed255058 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,18 +5,9 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
+   - Added <new feature>
+   - Fixed a bug (#<linked issue number>) where <bug behavior>.
 
-- Adds support for PHP7.4
-- Removes deprecated function, bringing true minimum version to 5.6
-- Adds validation for pages URIs without a selected template
-- Adding `is_system_on` setting caching, so updating does not alter whether the system is on after updating or bailing
-- Fixes variable type notices
-- Added default to same page for consent return
-- Fixes bug where `after_channel_entry_save` hook would run twice.
-- Ignores url_title in fetch param function, for issues related to URL titles called `n`
-- Fixes strpos `Non-string needles will be interpreted as strings in the future.` issue
-- Fixes a bug ([#382](https://github.com/ExpressionEngine/ExpressionEngine/issues/382)) where MSM File Fields breaking because of js error.
-- Fixes error in Pages module that leaves orphaned entries
 
 
 EOF MARKER: This line helps prevent merge conflicts when things are

From b770abbe88eb3e5f564db277296a7876424a56f3 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Thu, 9 Apr 2020 15:17:35 -0400
Subject: [PATCH 103/123] Fixed copyright on 5.3.1 update file

---
 system/ee/installer/updates/ud_5_03_01.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/installer/updates/ud_5_03_01.php b/system/ee/installer/updates/ud_5_03_01.php
index 1436989707..4c4021d6d5 100644
--- a/system/ee/installer/updates/ud_5_03_01.php
+++ b/system/ee/installer/updates/ud_5_03_01.php
@@ -4,7 +4,7 @@
 * ExpressionEngine (https://expressionengine.com)
 *
 * @link      https://expressionengine.com/
-* @copyright Copyright (c) 2003-2019, EllisLab Corp. (https://ellislab.com)
+* @copyright Copyright (c) 2003-2020, Packet Tide, LLC (https://packettide.com)
 * @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
 */
 

From 3a48cb90db85bd2d2021b5fa6a0fbbaadc2dc669 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Fri, 10 Apr 2020 16:26:41 +0300
Subject: [PATCH 104/123] fix path issues with one-click installer on Windows

---
 .../ExpressionEngine/Library/Filesystem/Filesystem.php       | 2 +-
 .../ExpressionEngine/Updater/Service/Updater/FileUpdater.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
index cb17554e92..ffb8500b3b 100644
--- a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
@@ -319,7 +319,7 @@ public function rename($source, $dest)
 			throw new FilesystemException("Cannot rename, destination already exists: {$dest}");
 		}
 
-		rename(
+		@rename(
 			$this->normalize($source),
 			$this->normalize($dest)
 		);
diff --git a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
index 5b49626227..69fdb52445 100644
--- a/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
+++ b/system/ee/installer/updater/EllisLab/ExpressionEngine/Updater/Service/Updater/FileUpdater.php
@@ -246,17 +246,18 @@ protected function move($source, $destination, Array $exclusions = [], $copy = F
 
 		$source = str_replace("\\", "/", $source);
 		$destination = str_replace("\\", "/", $destination);
+		$exclusions = array_map(function($path) { return str_replace("\\", "/", $path); }, $exclusions);
 
 		foreach ($contents as $path)
 		{
+			$path = str_replace("\\", "/", $path);
+
 			// Skip exclusions and .DS_Store
 			if (in_array($path, $exclusions) OR strpos($path, '.DS_Store') !== FALSE)
 			{
 				continue;
 			}
 
-			$path = str_replace("\\", "/", $path);
-
 			$new_path = str_replace($source, $destination, $path);
 
 			// Try to catch permissions errors before PHP's file I/O functions do

From b9d4df927bbce0e7105a6cc21bb41073ef1f370c Mon Sep 17 00:00:00 2001
From: Robin <robin.sowell@ellislab.com>
Date: Tue, 14 Apr 2020 12:00:11 -0400
Subject: [PATCH 105/123] =?UTF-8?q?Altered=20page=20tab=20validation=20to?=
 =?UTF-8?q?=20ignore=20template=20select=20when=20there=E2=80=99s=20no=20p?=
 =?UTF-8?q?age=20uri=20set.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelogs/patch.md                           |  2 +-
 system/ee/EllisLab/Addons/pages/tab.pages.php | 32 ++++++-------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..d91cffb6f5 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -8,7 +8,7 @@ Bullet list below, e.g.
    - Added <new feature>
    - Fixed a bug (#<linked issue number>) where <bug behavior>.
 
-
+   - Fixed a bug ([#399](https://github.com/ExpressionEngine/ExpressionEngine/issues/399)) in the Page's tab where setting a default template forced the Page URI field to be required.
 
 EOF MARKER: This line helps prevent merge conflicts when things are
 added on the bottoms of lists
diff --git a/system/ee/EllisLab/Addons/pages/tab.pages.php b/system/ee/EllisLab/Addons/pages/tab.pages.php
index 57a10bc48a..393ede7e52 100644
--- a/system/ee/EllisLab/Addons/pages/tab.pages.php
+++ b/system/ee/EllisLab/Addons/pages/tab.pages.php
@@ -140,41 +140,27 @@ public function display($channel_id, $entry_id = '')
 	public function validate($entry, $values)
 	{
 		$validator = ee('Validation')->make(array(
-			'pages_template_id' => 'validTemplate|validHasTemplate',
-			'pages_uri' => 'validURI|validHasTemplate|validSegmentCount|notDuplicated',
+			'pages_template_id' => 'whenURI[pages_uri]|required|validTemplate',
+			'pages_uri' => 'validURI|validSegmentCount|notDuplicated',
 		));
 
 		$validator->defineRule('validTemplate', $this->makeValidTemplateRule($values));
 		$validator->defineRule('validURI', $this->makeValidURIRule());
 		$validator->defineRule('validSegmentCount', $this->makeValidSegmentCountRule());
 		$validator->defineRule('notDuplicated', $this->makeNotDuplicatedRule($entry));
-		$validator->defineRule('validHasTemplate', $this->makeValidHasTemplateRule($values));
 
-		return $validator->validate($values);
-	}
-
-	/**
-	 * Validates whether a pages URI has been selected with a template
-	 * @param  array 	$values array of pages values coming from tab
-	 * @return Closure The logic needed to validate the data.
-	 */
-	private function makeValidHasTemplateRule($values)
-	{
-
-		return function($field, $value) use($values)
+		$data = $_POST;
+		$validator->defineRule('whenURI', function($key, $value, $parameters, $rule) use ($data)
 		{
-
-			if(
-				$values['pages_uri'] === ""
-				|| ($values['pages_uri'] !== "" && $values['pages_template_id'] === ""))
-			{
-				return 'invalid_template';
+			if ($data['pages__pages_uri'] == '' OR $data['pages__pages_uri'] == lang('example_uri')) {
+				return $rule->skip();
 			}
 
-			return true;
+			return TRUE;
 
-		};
+		});
 
+		return $validator->validate($values);
 	}
 
 	/**

From 860621a8f9de8fd10abf2490da8661a1f08b488e Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Wed, 15 Apr 2020 16:16:48 +0300
Subject: [PATCH 106/123] fix behavior of multiple checkboxes in table row
 EECORE-263

---
 themes/ee/asset/javascript/src/common.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/themes/ee/asset/javascript/src/common.js b/themes/ee/asset/javascript/src/common.js
index e33c734dd6..168944fc21 100644
--- a/themes/ee/asset/javascript/src/common.js
+++ b/themes/ee/asset/javascript/src/common.js
@@ -536,8 +536,10 @@ $(document).ready(function(){
 
 		// Highlight table rows when checked
 		$('body').on('click', 'table tr', function(event) {
-			if (event.target.nodeName != 'A') {
-       			$(this).children('td:last-child').children('input[type=checkbox]').click();
+			if ($(this).find('input[type=checkbox]').length==1) {
+				if (event.target.nodeName != 'A') {
+					$(this).children('td:last-child').children('input[type=checkbox]').click();
+				}
 			}
 		});
 
@@ -548,11 +550,13 @@ $(document).ready(function(){
 
 		// Toggle the bulk actions
 		$('body').on('change', 'table tr td:last-child input[type=checkbox], table tr th:last-child input[type=checkbox]', function() {
-			$(this).parents('tr').toggleClass('selected', $(this).is(':checked'));
-			if ($(this).parents('table').find('input:checked').length == 0) {
-				$(this).parents('.tbl-wrap').siblings('.tbl-bulk-act').hide();
-			} else {
-				$(this).parents('.tbl-wrap').siblings('.tbl-bulk-act').show();
+			if ($(this).parents('form').find('.bulk-action-bar').length > 0) {
+				$(this).parents('tr').toggleClass('selected', $(this).is(':checked'));
+				if ($(this).parents('table').find('input:checked').length == 0) {
+					$(this).parents('.tbl-wrap').siblings('.tbl-bulk-act').hide();
+				} else {
+					$(this).parents('.tbl-wrap').siblings('.tbl-bulk-act').show();
+				}
 			}
 		});
 

From 251d4f48cdc30d682ab1252ad2ff1fb96d12ce77 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Mon, 20 Apr 2020 09:56:28 +0300
Subject: [PATCH 107/123] Fixed a bug where removing database record for
 template that is used as "No access redirect" would cause error (EECORE-273)

---
 changelogs/minor.md                                    |  2 ++
 .../ExpressionEngine/Controller/Design/Template.php    | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index dee6b3d4ad..d12611925b 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -4,6 +4,8 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 ## Minor Release
 
+- Fixed a bug where removing database record for template that is used as "No access redirect" would cause error
+
 Bullet list below, e.g.
    - Added <new feature>
    - Fixed a bug (#<linked issue number>) where <bug behavior>.
diff --git a/system/ee/EllisLab/ExpressionEngine/Controller/Design/Template.php b/system/ee/EllisLab/ExpressionEngine/Controller/Design/Template.php
index 1a709cb360..9f973d8d52 100755
--- a/system/ee/EllisLab/ExpressionEngine/Controller/Design/Template.php
+++ b/system/ee/EllisLab/ExpressionEngine/Controller/Design/Template.php
@@ -1122,10 +1122,12 @@ private function getExistingTemplates($selected_id = NULL)
 				->with('Site')
 				->first();
 
-			$results[$template->getId()] = [
-				'label' => $template->getPath(),
-				'instructions' => bool_config_item('multiple_sites_enabled') ? $template->Site->site_label : NULL
-			];
+			if (!empty($template)) {
+				$results[$template->getId()] = [
+					'label' => $template->getPath(),
+					'instructions' => bool_config_item('multiple_sites_enabled') ? $template->Site->site_label : NULL
+				];
+			}
 		}
 
 		return $results;

From 03f8b38bd5ddc8b470ae9ee37c82dd894d19113e Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Apr 2020 11:17:24 -0400
Subject: [PATCH 108/123] Adding check for iconv

---
 system/ee/legacy/helpers/multibyte_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/ee/legacy/helpers/multibyte_helper.php b/system/ee/legacy/helpers/multibyte_helper.php
index 5c4ffe0ef6..d6b5bee30c 100644
--- a/system/ee/legacy/helpers/multibyte_helper.php
+++ b/system/ee/legacy/helpers/multibyte_helper.php
@@ -74,7 +74,7 @@ function ee_mb_strlen( $str, $encoding = null )
 
 		$encoding = ee_get_encoding($encoding);
 
-		if($encoding === 'CP850' || $encoding === 'ASCII')
+		if($encoding === 'CP850' || $encoding === 'ASCII' || ! extension_loaded('iconv'))
 		{
 
 			return strlen($str);
@@ -102,7 +102,7 @@ function ee_mb_strpos($haystack, $needle, $offset = 0, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
-		if($encoding === 'CP850' || $encoding === 'ASCII')
+		if($encoding === 'CP850' || $encoding === 'ASCII' || ! extension_loaded('iconv'))
 		{
 
 			return strpos($haystack, $needle, $offset);
@@ -139,7 +139,7 @@ function ee_mb_substr($str, $start, $length = null, $encoding = null)
 	{
 		$encoding = ee_get_encoding($encoding);
 
-		if('CP850' === $encoding || 'ASCII' === $encoding)
+		if('CP850' === $encoding || 'ASCII' === $encoding || ! extension_loaded('iconv'))
 		{
 
 			return (string) substr($str, $start, null === $length ? 2147483647 : $length);

From ae1775e15fb4d5fbfc2c4e926698559ab4cac20a Mon Sep 17 00:00:00 2001
From: Douglas Black <dougblackjr@gmail.com>
Date: Mon, 20 Apr 2020 11:35:37 -0400
Subject: [PATCH 109/123] Adding changelog

---
 changelogs/patch.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..f9d1c45818 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,8 +5,7 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+   - Fixed a bug (#[406](https://github.com/ExpressionEngine/ExpressionEngine/issues/406)) where missing iconv extension was causing issues.
 
 
 

From 63f1345b11549fbb8b4ec7a5330f115e0bd30b71 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Tue, 21 Apr 2020 08:57:45 +0300
Subject: [PATCH 110/123] catch version check curl errors EECORE-291

---
 system/ee/legacy/libraries/El_pings.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/El_pings.php b/system/ee/legacy/libraries/El_pings.php
index 515d4b9eda..851da165b9 100644
--- a/system/ee/legacy/libraries/El_pings.php
+++ b/system/ee/legacy/libraries/El_pings.php
@@ -126,7 +126,10 @@ public function get_version_info($force_update = FALSE)
 			catch (\Exception $e)
 			{
 				// don't scare the user with whatever random error, but store it for debugging
-				$version_file = $e->getMessage();
+				$version_file = [
+					'error' => true,
+					'error_msg' => $e->getMessage()
+				];
 			}
 
 			// Cache version information for a day
@@ -171,6 +174,8 @@ public function getUpgradeInfo($force_update = FALSE)
 	{
 		$version_file = $this->get_version_info($force_update);
 
+		if (!$version_file) return $version_file;
+
 		$version_info = array(
 			'version' => $version_file['latest_version'],
 			'build' => $version_file['build_date'],

From bfb1134d62fdb652fe82342763f5d11263aba1e8 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Tue, 21 Apr 2020 09:00:31 +0300
Subject: [PATCH 111/123] no message

---
 changelogs/minor.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index dee6b3d4ad..66efa76d97 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -4,6 +4,8 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 ## Minor Release
 
+- Fixed a bug where checking for updates might produce an error.
+
 Bullet list below, e.g.
    - Added <new feature>
    - Fixed a bug (#<linked issue number>) where <bug behavior>.

From 7df0f663ad40c463651b96fed2ba737594144701 Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Thu, 2 Jan 2020 22:05:04 -0500
Subject: [PATCH 112/123] Update Category.php for PHP 7.4

Fixes bool error in PHP 7.4 by providing an empty value if category images are not set.
---
 .../libraries/channel_entries_parser/components/Category.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/legacy/libraries/channel_entries_parser/components/Category.php b/system/ee/legacy/libraries/channel_entries_parser/components/Category.php
index 9adef9a867..7002fabfe5 100644
--- a/system/ee/legacy/libraries/channel_entries_parser/components/Category.php
+++ b/system/ee/legacy/libraries/channel_entries_parser/components/Category.php
@@ -202,7 +202,7 @@ public function replace($tagdata, EE_Channel_data_parser $obj, $cat_chunk)
 						'category_url_title'     => $v[6],
 						'category_description'   => (isset($v[4])) ? ee()->functions->encode_ee_tags($v[4]) : '',
 						'category_group'         => (isset($v[5])) ? $v[5] : '',
-						'category_image'         => $cat_image['url'],
+						'category_image'         => (isset($cat_image['url'])) ? $cat_image['url'] : '',
 						'category_id'            => $v[0],
 						'parent_id'              => $v[1],
 						'active'                 => ($active_cat == $v[0] || $active_cat == $v[6])

From 7e21f59c58c8a4e738f15916736fd6cde08bc497 Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Fri, 3 Jan 2020 11:32:18 -0500
Subject: [PATCH 113/123] Update Template.php for PHP 7.4

Removes an errant space and fixes PHP 7.4 notice (when debugging):

"Trying to access array offset on value of type bool"

Added some checks before $last['time'] and $last['memory'] are used for debugging.
---
 system/ee/legacy/libraries/Template.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/ee/legacy/libraries/Template.php b/system/ee/legacy/libraries/Template.php
index e868d1bac0..bc11ce2859 100644
--- a/system/ee/legacy/libraries/Template.php
+++ b/system/ee/legacy/libraries/Template.php
@@ -2977,7 +2977,7 @@ function _create_from_file($template_group, $template, $db_check = FALSE)
 			'edit_date'				=> ee()->localize->now,
 			'last_author_id'		=> '1',	// assume a super admin
 			'site_id'				=> ee()->config->item('site_id')
-		 );
+		);
 
 		$template_id = ee()->template_model->create_template($data);
 
@@ -3533,13 +3533,12 @@ function log_item($str, $details = FALSE)
 		$time = microtime(TRUE)-$this->start_microtime;
 
 		$memory_usage = memory_get_usage();
-
 		$last = end($this->log);
 		$time = number_format($time, 6);
 		$last_time = isset($last['time']) ? $last['time'] : 0;
 		$time_gain = $time - $last_time;
 		$last_memory = isset($last['memory']) ? $last['memory'] : 0;
-		$memory_gain = $memory_usage - $last['memory'];
+		$memory_gain = $memory_usage - $last_memory;
 
 		$this->log[] = array(
 			'time' => $time,

From 6b6ff9c1a242114ee9e1bbe776f41324978a823c Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Sun, 12 Jan 2020 12:09:00 -0500
Subject: [PATCH 114/123] Update Rte_lib.php for PHP 7.4

Remove notice in 7.4 by creating simple check for the include jquery_ui variable before checking if it exists.
---
 system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php b/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
index fe95123482..7fb19358e2 100644
--- a/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
+++ b/system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
@@ -334,7 +334,9 @@ public function build_js($toolset_id, $selector, $include = [], $cp_only = FALSE
 			'libraries' 	=> array(
 				'plugin' => array('wysihat')
 			)
-		);
+    );
+    
+    $include['jquery_ui'] = isset($include['jquery_ui']) ? $include['jquery_ui'] : false;
 
 		if (array_key_exists('jquery_ui', $include) && $include['jquery_ui'])
 		{

From 3549eaa35cb36dd82d493d33d1f2bd94ff33cde2 Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Wed, 15 Jan 2020 01:27:51 -0500
Subject: [PATCH 115/123] Update ChannelLayout.php

Add check for $field_name value before checking $field_name.
---
 .../EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/ee/EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php b/system/ee/EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php
index f05dcab790..e5c8901f05 100644
--- a/system/ee/EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php
+++ b/system/ee/EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php
@@ -196,7 +196,7 @@ public function synchronize($fields = [])
 		{
 			foreach ($section['fields'] as $j => $field_info)
 			{
-				$field_name = $field_info['field'];
+				$field_name = isset($field_info['field']) ? $field_info['field'] : 0;
 
 				if (strpos($field_name, 'field_id_') !== 0)
 				{

From e0f8c082eb105af20f10fcf1376cf539d613d36c Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Wed, 22 Jan 2020 12:50:12 -0500
Subject: [PATCH 116/123] Update patch.md

---
 changelogs/patch.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 3aed255058..4ea9f9227e 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -3,10 +3,7 @@
 ExpressionEngine uses semantic versioning. This file contains changes to ExpressionEngine since the last Build / Version release for PATCH version changes only.
 
 ## Patch Release
-
-Bullet list below, e.g.
-   - Added <new feature>
-   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+    - Updates six (6) files for PHP 7.4 compatibility.
 
 
 

From eae836a8283f3a4f30ed611abe7c54786bea19f3 Mon Sep 17 00:00:00 2001
From: Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
Date: Wed, 22 Jan 2020 13:05:32 -0500
Subject: [PATCH 117/123] Update patch.md

Added changes and formatting.
---
 changelogs/patch.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/changelogs/patch.md b/changelogs/patch.md
index 4ea9f9227e..ab194f4658 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -3,9 +3,19 @@
 ExpressionEngine uses semantic versioning. This file contains changes to ExpressionEngine since the last Build / Version release for PATCH version changes only.
 
 ## Patch Release
-    - Updates six (6) files for PHP 7.4 compatibility.
-
-
-
+- Updates six (6) files for PHP 7.4 compatibility.
+    - system/ee/EllisLab/ExpressionEngine/Model/Channel/ChannelLayout.php
+        - Ternary check on $field_name
+    - system/ee/EllisLab/Addons/channel/mod.channel.php
+        - Swap implode parameter order
+    - system/ee/EllisLab/Addons/rte/libraries/Rte_lib.php
+        - Ternary check on $include['jquery_ui']
+    - system/ee/legacy/libraries/channel_entries_parser/components/Category.php
+        - Ternary check on $cat_image['url']
+    - system/ee/legacy/libraries/Template.php
+        - Ternary checks for $last_time and $last_memory
+    - system/ee/legacy/core/Input.php
+        - PHP version check for magic_quotes_gpc
+    
 EOF MARKER: This line helps prevent merge conflicts when things are
 added on the bottoms of lists

From 259495b74d1ea641ff7f57275d4eacc9da1c68b9 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@designingit.com>
Date: Tue, 21 Apr 2020 21:30:24 +0300
Subject: [PATCH 118/123] explain rename silencing

---
 .../EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
index ffb8500b3b..7992e68adf 100644
--- a/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
+++ b/system/ee/EllisLab/ExpressionEngine/Library/Filesystem/Filesystem.php
@@ -319,6 +319,7 @@ public function rename($source, $dest)
 			throw new FilesystemException("Cannot rename, destination already exists: {$dest}");
 		}
 
+		// Suppressing potential warning when renaming a directory to one that already exists.
 		@rename(
 			$this->normalize($source),
 			$this->normalize($dest)

From ac38b9b845b45670fb5d584a8fb98add27e07b95 Mon Sep 17 00:00:00 2001
From: Yuri Salimovskiy <yuri@packettide.com>
Date: Wed, 22 Apr 2020 16:01:43 +0300
Subject: [PATCH 119/123] fix bug when on some pages bulk actions not becoming
 visible EECORE-299

---
 themes/ee/asset/javascript/src/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ee/asset/javascript/src/common.js b/themes/ee/asset/javascript/src/common.js
index 168944fc21..a3eefc69e6 100644
--- a/themes/ee/asset/javascript/src/common.js
+++ b/themes/ee/asset/javascript/src/common.js
@@ -550,7 +550,7 @@ $(document).ready(function(){
 
 		// Toggle the bulk actions
 		$('body').on('change', 'table tr td:last-child input[type=checkbox], table tr th:last-child input[type=checkbox]', function() {
-			if ($(this).parents('form').find('.bulk-action-bar').length > 0) {
+			if ($(this).parents('form').find('.tbl-bulk-act').length > 0) {
 				$(this).parents('tr').toggleClass('selected', $(this).is(':checked'));
 				if ($(this).parents('table').find('input:checked').length == 0) {
 					$(this).parents('.tbl-wrap').siblings('.tbl-bulk-act').hide();

From 3af331e4c32920ac35fc39db7eace768070b23cd Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Wed, 22 Apr 2020 14:03:08 -0400
Subject: [PATCH 120/123] Added 5.3.2 update file

---
 system/ee/installer/updates/ud_5_03_02.php | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 system/ee/installer/updates/ud_5_03_02.php

diff --git a/system/ee/installer/updates/ud_5_03_02.php b/system/ee/installer/updates/ud_5_03_02.php
new file mode 100644
index 0000000000..6e8ba6ecf3
--- /dev/null
+++ b/system/ee/installer/updates/ud_5_03_02.php
@@ -0,0 +1,32 @@
+<?php
+/**
+* This source file is part of the open source project
+* ExpressionEngine (https://expressionengine.com)
+*
+* @link      https://expressionengine.com/
+* @copyright Copyright (c) 2003-2020, Packet Tide, LLC (https://packettide.com)
+* @license   https://expressionengine.com/license Licensed under Apache License, Version 2.0
+*/
+
+namespace EllisLab\ExpressionEngine\Updater\Version_5_3_2;
+
+/**
+* Update
+*/
+class Updater {
+
+	var $version_suffix = '';
+
+	/**
+	* Do Update
+	*
+	* @return TRUE
+	*/
+	public function do_update()
+	{
+		return TRUE;
+	}
+
+}
+
+// EOF

From d448c1f141a0557dce87b57f384b559e902003b4 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Wed, 22 Apr 2020 15:01:32 -0400
Subject: [PATCH 121/123] Version bump for patch release

---
 system/ee/installer/controllers/wizard.php | 2 +-
 system/ee/legacy/libraries/Core.php        | 4 ++--
 tests/circleci/config.php                  | 2 +-
 tests/docker/config.php                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/ee/installer/controllers/wizard.php b/system/ee/installer/controllers/wizard.php
index 6f1c4506b7..3ab36f8c91 100644
--- a/system/ee/installer/controllers/wizard.php
+++ b/system/ee/installer/controllers/wizard.php
@@ -13,7 +13,7 @@
  */
 class Wizard extends CI_Controller {
 
-	public $version           = '5.3.1';	// The version being installed
+	public $version           = '5.3.2';	// The version being installed
 	public $installed_version = ''; 		// The version the user is currently running (assuming they are running EE)
 	public $schema            = NULL;		// This will contain the schema object with our queries
 	public $languages         = array(); 	// Available languages the installer supports (set dynamically based on what is in the "languages" folder)
diff --git a/system/ee/legacy/libraries/Core.php b/system/ee/legacy/libraries/Core.php
index 926b203b05..73821f6526 100644
--- a/system/ee/legacy/libraries/Core.php
+++ b/system/ee/legacy/libraries/Core.php
@@ -72,8 +72,8 @@ public function bootstrap()
 
 		// application constants
 		define('APP_NAME',		'ExpressionEngine');
-		define('APP_BUILD',		'20200402');
-		define('APP_VER',		'5.3.1');
+		define('APP_BUILD',		'20200422');
+		define('APP_VER',		'5.3.2');
 		define('APP_VER_ID',	'');
 		define('SLASH',			'&#47;');
 		define('LD',			'{');
diff --git a/tests/circleci/config.php b/tests/circleci/config.php
index 9a7adbe4d4..25dbac61ca 100644
--- a/tests/circleci/config.php
+++ b/tests/circleci/config.php
@@ -19,7 +19,7 @@
 }
 
 $config['site_url'] = 'http://ee2.test:8080/';
-$config['app_version'] = '5.3.1';
+$config['app_version'] = '5.3.2';
 $config['license_contact'] = 'ellislab.developers@gmail.com';
 $config['license_number'] = '1234-5678-9123-4567';
 $config['debug'] = '1';
diff --git a/tests/docker/config.php b/tests/docker/config.php
index 7cf0ffc90c..8aace2442d 100644
--- a/tests/docker/config.php
+++ b/tests/docker/config.php
@@ -20,7 +20,7 @@
 
 $config['base_url'] = 'http://localhost/';
 $config['site_url'] = $config['base_url'];
-$config['app_version'] = '5.3.1';
+$config['app_version'] = '5.3.2';
 $config['license_contact'] = 'ellislab.devleopers@gmail.com';
 $config['license_number'] = '1234-5678-9123-4567';
 $config['debug'] = '1';

From 3fad60c3f09aa3a96a12cfca77b707e5f3d45a14 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Wed, 22 Apr 2020 15:03:22 -0400
Subject: [PATCH 122/123] Updated Authors

---
 AUTHORS.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 98082c4768..1b59226361 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,9 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 
 - Aaron Gustafson <aaron@easy-designs.net>
 - Adrienne L. Travis <adrienne@utilitarienne.com>
+- Andy McCormick <andy@packettide.com>
 - Barry Cogan <barry.cogan@ellislab.com>
+- Benoit Lemay <benoit.lemay@griffmedia.com>
 - Bill MacKenty <bmackenty@users.noreply.github.com>
 - Brandon Jones <brandon.jones@ellislab.com>
 - Brian Litzinger <litzinger@gmail.com>
@@ -14,9 +16,11 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 - Derek Jones <derek.jones@ellislab.com>
 - Douglas Black <dougblackjr@gmail.com>
 - Gareth Davies <hello@garethtdavies.com>
+- Gary Reckard <gary@happycog.com>
 - Greg Aker <greg.aker@ellislab.com>
 - Greg Ferrell <info@studiokoi.com>
 - Hop Studios <46464558+HopStudios-Development@users.noreply.github.com>
+- Jace Richardson <obfuscode@users.noreply.github.com>
 - Jack McDade <jack@jackmcdade.com>
 - James Mathias <james.mathias@ellislab.com>
 - Jeremy Worboys <jw@jeremyworboys.com>
@@ -33,6 +37,7 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 - Pascal Kriete <pascal.kriete@ellislab.com>
 - Quinn Chrzan <quinn.chrzan@ellislab.com>
 - Rein de Vries <info@reinos.nl>
+- Richard John-Paul <41839431+rjpdev@users.noreply.github.com>
 - Rick Ellis <rick.ellis@ellislab.com>
 - Rob Sanchez <rob@robsanchez.com>
 - Robin Sowell <robin.sowell@ellislab.com>
@@ -40,10 +45,11 @@ If an entry is incorrect or duplicated, add or correct the entry in `.mailmap` i
 - Ryan McAllen <rhyno@rhynodesigns.com>
 - Seth Croston Barber <seth.barber@ellislab.com>
 - Wes Baker <wes.baker@ellislab.com>
+- Yuri Salimovskiy <yuri@packettide.com>
 - Zeke Aasman <zeke@aasman.ca>
 - 🤖 (bots/scripts/importers) <devnull@localhost>
 
-![](https://www.gravatar.com/avatar/323311bb4cc5af1a4b2c5c26b4cfc5a3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/28fd78ec7f39c9667c57ddcda6b83351.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/fd949d0a7e4991516b70f53e1cd32687.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3ffe6ce41e3bf074f3be0b58f82ebf29.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/44ef19fe2f0d9f5047279a585663fd67.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/069965463531f082c67fa8087eff0b05.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3e9d57bf5c8481eca26817339b1a3bd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/29abcce86d2506d61ac673588eb8a7d1.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/516e0d6461814f8a47c7fa649359e153.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/bcf753700280546563d4a604e3a71060.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5ca14d9704b3eee3260127bfcc6ecf42.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91d827f8f25f63b8112790de73a1d938.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/06fa48390d4d830b110af14955586a93.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/799094e096097741819df942dd34345b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/742b52b2e6a0c30489c5920a1a74b16e.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/d97bb7470a585d1f835e0830c01f0b20.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5cd8a4f8e479da78fc66fbb2367399d4.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/957b0b58ae039db05df43e46c1e0b333.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/4725a112987ef504b80b3ae726038c60.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aa4bb05aae17dee79b899506017a39ee.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b3aee19cfd195316fa300ba8e57e6fd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/135073ed48a5ff8fb6fcda84df0b5723.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/52b49de838ac68b9b5f7c9694a03bc2b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/82c0460c0faad308ffe33968c614f539.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/fef8890999449994c34b5f22d29e510d.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9628e9a39607342152d295ff42d4a415.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/130f8285c0fc74b49f6aa04cc5b14967.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/a2b77333c38e0478272301b78691c0f9.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1d157c5426bdf80e829b92446c930291.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/18b650e3eb0eb19d390b600b89c54a08.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ac84e65458272d4d56a9f0e989633522.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5dab46346a7e1ddf461a71c6b05101c0.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/92508cc5ce3ed75dd47b4d508b0de8bd.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9950bab22f7c1baaf19484f54cec5717.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/a3913e91ee062726d4e6d1eca9071d0b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aef020d45cf114662488d9e3b9d5b1da.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ec72c77b2a1e31882eaafa9c888c84eb.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/94260e052fa9c0df9e87428d07c2966a.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/531770a99fef15a89bfee23e44851a09.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1e2785ef5c8fd9fdf4fb3e01a2328b11.jpg?r=pg&d=robohash )
+![](https://www.gravatar.com/avatar/323311bb4cc5af1a4b2c5c26b4cfc5a3.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/68e8b768c20fbd21f72918c5baaacdae.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/28fd78ec7f39c9667c57ddcda6b83351.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/74a1e3cd4b1ad5fc087e0e7704ed1850.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/02553319e74f65aefabb110a9d83b121.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/fd949d0a7e4991516b70f53e1cd32687.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3ffe6ce41e3bf074f3be0b58f82ebf29.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/44ef19fe2f0d9f5047279a585663fd67.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/069965463531f082c67fa8087eff0b05.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/3e9d57bf5c8481eca26817339b1a3bd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/29abcce86d2506d61ac673588eb8a7d1.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/516e0d6461814f8a47c7fa649359e153.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/bcf753700280546563d4a604e3a71060.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5ca14d9704b3eee3260127bfcc6ecf42.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/91d827f8f25f63b8112790de73a1d938.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/6202c1bd8201c22252d0c3a901185dd0.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/06fa48390d4d830b110af14955586a93.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/799094e096097741819df942dd34345b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/742b52b2e6a0c30489c5920a1a74b16e.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/cd9f870be16a27dafb29a7243e306b6f.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5113a79fa6bfde5c7e37186b530de617.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/d97bb7470a585d1f835e0830c01f0b20.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5cd8a4f8e479da78fc66fbb2367399d4.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/957b0b58ae039db05df43e46c1e0b333.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/4725a112987ef504b80b3ae726038c60.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aa4bb05aae17dee79b899506017a39ee.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/b3aee19cfd195316fa300ba8e57e6fd2.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/135073ed48a5ff8fb6fcda84df0b5723.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/52b49de838ac68b9b5f7c9694a03bc2b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/82c0460c0faad308ffe33968c614f539.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/fef8890999449994c34b5f22d29e510d.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9628e9a39607342152d295ff42d4a415.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/130f8285c0fc74b49f6aa04cc5b14967.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/a2b77333c38e0478272301b78691c0f9.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1d157c5426bdf80e829b92446c930291.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/18b650e3eb0eb19d390b600b89c54a08.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ac84e65458272d4d56a9f0e989633522.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ce6dc7ab6baeb4f0e530683eb19e327a.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/5dab46346a7e1ddf461a71c6b05101c0.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/92508cc5ce3ed75dd47b4d508b0de8bd.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/9950bab22f7c1baaf19484f54cec5717.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/a3913e91ee062726d4e6d1eca9071d0b.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/aef020d45cf114662488d9e3b9d5b1da.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/ec72c77b2a1e31882eaafa9c888c84eb.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/94260e052fa9c0df9e87428d07c2966a.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/209b0eb58c406de491f9f7f8039781a8.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/e45a32284d21e406e0abe5bc701d7e3a.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/531770a99fef15a89bfee23e44851a09.jpg?r=pg&d=robohash )![](https://www.gravatar.com/avatar/1e2785ef5c8fd9fdf4fb3e01a2328b11.jpg?r=pg&d=robohash )
 
 Additionally, the following contributed source code prior to 2009 when this repository was created:
 

From 82d7d2d68e8b6e4244489b3ce051305e83af8824 Mon Sep 17 00:00:00 2001
From: Jace Richardson <hello@jace.is>
Date: Wed, 22 Apr 2020 15:18:58 -0400
Subject: [PATCH 123/123] Reset changelogs to default

---
 changelogs/minor.md | 3 ---
 changelogs/patch.md | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/changelogs/minor.md b/changelogs/minor.md
index 7129678cc6..dee6b3d4ad 100644
--- a/changelogs/minor.md
+++ b/changelogs/minor.md
@@ -4,9 +4,6 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 
 ## Minor Release
 
-- Fixed a bug where checking for updates might produce an error.
-- Fixed a bug where removing database record for template that is used as "No access redirect" would cause error
-
 Bullet list below, e.g.
    - Added <new feature>
    - Fixed a bug (#<linked issue number>) where <bug behavior>.
diff --git a/changelogs/patch.md b/changelogs/patch.md
index 984955b95c..3aed255058 100644
--- a/changelogs/patch.md
+++ b/changelogs/patch.md
@@ -5,10 +5,10 @@ ExpressionEngine uses semantic versioning. This file contains changes to Express
 ## Patch Release
 
 Bullet list below, e.g.
-   - Fixed a bug (#[406](https://github.com/ExpressionEngine/ExpressionEngine/issues/406)) where missing iconv extension was causing issues.
+   - Added <new feature>
+   - Fixed a bug (#<linked issue number>) where <bug behavior>.
+
+
 
-   - Fixed a bug ([#399](https://github.com/ExpressionEngine/ExpressionEngine/issues/399)) in the Page's tab where setting a default template forced the Page URI field to be required.
-   - Updates additional files for PHP 7.4 compatibility.
-    
 EOF MARKER: This line helps prevent merge conflicts when things are
 added on the bottoms of lists