From b542e8ad25d859ad5781ad4cc647abc5ea4989cc Mon Sep 17 00:00:00 2001
From: Anton Samuelsson <samuelsson.anton@gmail.com>
Date: Thu, 16 Apr 2020 09:36:27 +0000
Subject: [PATCH 1/3] Removed unsued file

---
 .../Mage/Core/Model/Resource/Session.php      | 288 ------------------
 composer.json                                 |   4 -
 2 files changed, 292 deletions(-)
 delete mode 100644 app/code/community/Mage/Core/Model/Resource/Session.php

diff --git a/app/code/community/Mage/Core/Model/Resource/Session.php b/app/code/community/Mage/Core/Model/Resource/Session.php
deleted file mode 100644
index 38794ba..0000000
--- a/app/code/community/Mage/Core/Model/Resource/Session.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magento.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magento.com for more information.
- *
- * @category    Mage
- * @package     Mage_Core
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
- * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-
-/**
- * Mysql4 session save handler
- *
- * @category    Mage
- * @package     Mage_Core
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-class Mage_Core_Model_Resource_Session implements Zend_Session_SaveHandler_Interface
-{
-    /**
-     * Session maximum cookie lifetime
-     */
-    const SEESION_MAX_COOKIE_LIFETIME = 3155692600;
-
-    /**
-     * Session lifetime
-     *
-     * @var integer
-     */
-    protected $_lifeTime;
-
-    /**
-     * Session data table name
-     *
-     * @var string
-     */
-    protected $_sessionTable;
-
-    /**
-     * Database read connection
-     *
-     * @var Varien_Db_Adapter_Interface
-     */
-    protected $_read;
-
-    /**
-     * Database write connection
-     *
-     * @var Varien_Db_Adapter_Interface
-     */
-    protected $_write;
-
-    /**
-     * Automatic cleaning factor of expired sessions
-     * value zero means no automatic cleaning, one means automatic cleaning each time a session is closed, and x>1 means
-     * cleaning once in x calls
-     *
-     * @var int
-     */
-    protected $_automaticCleaningFactor    = 50;
-
-    /**
-     * Constructor
-     *
-     */
-    public function __construct()
-    {
-        $resource = Mage::getSingleton('core/resource');
-        $this->_sessionTable = $resource->getTableName('core/session');
-        $this->_read         = $resource->getConnection('core_read');
-        $this->_write        = $resource->getConnection('core_write');
-    }
-
-    /**
-     * Destrucor
-     *
-     */
-    public function __destruct()
-    {
-        session_write_close();
-    }
-
-    /**
-     * Retrieve session life time
-     *
-     * @return int
-     */
-    public function getLifeTime()
-    {
-        if (is_null($this->_lifeTime)) {
-            $configNode = Mage::app()->getStore()->isAdmin() ?
-                    'admin/security/session_cookie_lifetime' : 'web/cookie/cookie_lifetime';
-            $this->_lifeTime = (int) Mage::getStoreConfig($configNode);
-
-            if ($this->_lifeTime < 60) {
-                $this->_lifeTime = ini_get('session.gc_maxlifetime');
-            }
-
-            if ($this->_lifeTime < 60) {
-                $this->_lifeTime = 3600; //one hour
-            }
-
-            if ($this->_lifeTime > self::SEESION_MAX_COOKIE_LIFETIME) {
-                $this->_lifeTime = self::SEESION_MAX_COOKIE_LIFETIME; // 100 years
-            }
-        }
-        return $this->_lifeTime;
-    }
-
-    /**
-     * Check DB connection
-     *
-     * @return bool
-     */
-    public function hasConnection()
-    {
-        if (!$this->_read) {
-            return false;
-        }
-        if (!$this->_read->isTableExists($this->_sessionTable)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Setup save handler
-     *
-     * @return Mage_Core_Model_Resource_Session
-     */
-    public function setSaveHandler()
-    {
-        if ($this->hasConnection()) {
-            session_set_save_handler(
-                array($this, 'open'),
-                array($this, 'close'),
-                array($this, 'read'),
-                array($this, 'write'),
-                array($this, 'destroy'),
-                array($this, 'gc')
-            );
-        } else {
-            session_save_path(Mage::getBaseDir('session'));
-        }
-        return $this;
-    }
-
-    /**
-     * Adds session handler via static call
-     */
-    public static function setStaticSaveHandler()
-    {
-        $handler = new self;
-        $handler->setSaveHandler();
-    }
-
-    /**
-     * Open session
-     *
-     * @param string $savePath ignored
-     * @param string $sessName ignored
-     * @return boolean
-     */
-    public function open($savePath, $sessName)
-    {
-        return true;
-    }
-
-    /**
-     * Close session
-     *
-     * @return boolean
-     */
-    public function close()
-    {
-        $this->gc($this->getLifeTime());
-
-        return true;
-    }
-
-    /**
-     * Fetch session data
-     *
-     * (Fix for PHP 7 to make sure it really returns string type as docblock promises, because otherwise session
-     * crashes.)
-     *
-     * @param string $sessId
-     * @return string
-     */
-    public function read($sessId)
-    {
-        $select = $this->_read->select()
-                ->from($this->_sessionTable, array('session_data'))
-                ->where('session_id = :session_id')
-                ->where('session_expires > :session_expires');
-        $bind = array(
-            'session_id'      => $sessId,
-            'session_expires' => Varien_Date::toTimestamp(true)
-        );
-
-        $data = $this->_read->fetchOne($select, $bind);
-
-        return (string)$data;
-    }
-
-    /**
-     * Update session
-     *
-     * @param string $sessId
-     * @param string $sessData
-     * @return boolean
-     */
-    public function write($sessId, $sessData)
-    {
-        $bindValues = array(
-            'session_id'      => $sessId
-        );
-        $select = $this->_write->select()
-                ->from($this->_sessionTable)
-                ->where('session_id = :session_id');
-        $exists = $this->_read->fetchOne($select, $bindValues);
-
-        $bind = array(
-            'session_expires' => Varien_Date::toTimestamp(true) + $this->getLifeTime(),
-            'session_data' => $sessData
-        );
-        if ($exists) {
-            $where = array(
-                'session_id=?' => $sessId
-            );
-            $this->_write->update($this->_sessionTable, $bind, $where);
-        } else {
-            $bind['session_id'] = $sessId;
-            $this->_write->insert($this->_sessionTable, $bind);
-        }
-
-        return true;
-    }
-
-    /**
-     * Destroy session
-     *
-     * @param string $sessId
-     * @return boolean
-     */
-    public function destroy($sessId)
-    {
-        $where = array('session_id = ?' => $sessId);
-        $this->_write->delete($this->_sessionTable, $where);
-        return true;
-    }
-
-    /**
-     * Garbage collection
-     *
-     * @param int $sessMaxLifeTime ignored
-     * @return boolean
-     */
-    public function gc($sessMaxLifeTime)
-    {
-        if ($this->_automaticCleaningFactor > 0) {
-            if ($this->_automaticCleaningFactor == 1 ||
-                rand(1, $this->_automaticCleaningFactor) == 1) {
-                $where = array('session_expires < ?' => Varien_Date::toTimestamp(true));
-                $this->_write->delete($this->_sessionTable, $where);
-            }
-        }
-        return true;
-    }
-}
diff --git a/composer.json b/composer.json
index 270ca9e..c9c95d7 100644
--- a/composer.json
+++ b/composer.json
@@ -101,10 +101,6 @@
                 "app/code/community/Mage/Core/Helper/Data.php",
                 "app/code/community/Mage/Core/Helper/Data.php"
             ],
-            [
-                "app/code/community/Mage/Core/Model/Resource/Session.php",
-                "app/code/community/Mage/Core/Model/Resource/Session.php"
-            ],
             [
                 "app/code/community/Mage/Sales/Model/Config/Ordered.php",
                 "app/code/community/Mage/Sales/Model/Config/Ordered.php"

From dfd8d0fb087d409d27c6b50b74ec97903a4f925c Mon Sep 17 00:00:00 2001
From: Anton Samuelsson <samuelsson.anton@gmail.com>
Date: Thu, 16 Apr 2020 09:36:46 +0000
Subject: [PATCH 2/3] Updated to 1.9.4.4 deps

---
 .../Mage/Adminhtml/Block/Widget/Form.php      |  5 +-
 .../Mage/Catalog/Model/Indexer/Url.php        |  2 +-
 .../Model/Resource/Category/Collection.php    |  2 +-
 .../Model/Resource/Product/Indexer/Price.php  |  3 +-
 .../Mage/Catalog/Model/Resource/Url.php       |  3 +-
 app/code/community/Mage/Catalog/Model/Url.php | 82 ++++++++++---------
 .../Model/Action/Index/Refresh.php            |  2 +-
 .../community/Mage/CatalogRule/Model/Rule.php |  3 +-
 app/code/community/Mage/Core/Helper/Data.php  | 38 +++++++--
 .../Mage/Sales/Model/Config/Ordered.php       |  2 +-
 .../Mage/Sales/Model/Quote/Item/Abstract.php  |  3 +-
 .../Mage/Sales/Model/Resource/Order.php       |  3 +-
 .../Rule/Condition/Product/Subselect.php      |  3 +-
 .../community/Mage/Uploader/Helper/File.php   |  2 +-
 .../community/Varien/Simplexml/Element.php    |  2 +-
 15 files changed, 96 insertions(+), 59 deletions(-)

diff --git a/app/code/community/Mage/Adminhtml/Block/Widget/Form.php b/app/code/community/Mage/Adminhtml/Block/Widget/Form.php
index 7965e00..8acdb21 100644
--- a/app/code/community/Mage/Adminhtml/Block/Widget/Form.php
+++ b/app/code/community/Mage/Adminhtml/Block/Widget/Form.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Adminhtml
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -204,13 +204,11 @@ protected function _setFieldset($attributes, $fieldset, $exclude=array())
                     $element->setCanBeEmpty(true);
                 } else if ($inputType == 'date') {
                     $element->setImage($this->getSkinUrl('images/grid-cal.gif'));
-                    $element->setLocale(Mage::app()->getLocale()->getLocale());
                     $element->setFormat(Mage::app()->getLocale()->getDateFormatWithLongYear());
                 } else if ($inputType == 'datetime') {
                     $element->setImage($this->getSkinUrl('images/grid-cal.gif'));
                     $element->setTime(true);
                     $element->setStyle('width:50%;');
-                    $element->setLocale(Mage::app()->getLocale()->getLocale());
                     $element->setFormat(
                         Mage::app()->getLocale()->getDateTimeFormat(Mage_Core_Model_Locale::FORMAT_TYPE_SHORT)
                     );
@@ -256,3 +254,4 @@ protected function _getAdditionalElementHtml($element)
     }
 
 }
+
diff --git a/app/code/community/Mage/Catalog/Model/Indexer/Url.php b/app/code/community/Mage/Catalog/Model/Indexer/Url.php
index 717a4df..514a6db 100644
--- a/app/code/community/Mage/Catalog/Model/Indexer/Url.php
+++ b/app/code/community/Mage/Catalog/Model/Indexer/Url.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Catalog
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/community/Mage/Catalog/Model/Resource/Category/Collection.php b/app/code/community/Mage/Catalog/Model/Resource/Category/Collection.php
index f27dfb1..cb642d6 100644
--- a/app/code/community/Mage/Catalog/Model/Resource/Category/Collection.php
+++ b/app/code/community/Mage/Catalog/Model/Resource/Category/Collection.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Catalog
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/community/Mage/Catalog/Model/Resource/Product/Indexer/Price.php b/app/code/community/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
index 4a7fd60..817a956 100644
--- a/app/code/community/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
+++ b/app/code/community/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Catalog
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -618,3 +618,4 @@ public function getIdxTable($table = null)
         return $this->getTable('catalog/product_price_indexer_tmp');
     }
 }
+
diff --git a/app/code/community/Mage/Catalog/Model/Resource/Url.php b/app/code/community/Mage/Catalog/Model/Resource/Url.php
index 383fc85..6e49797 100644
--- a/app/code/community/Mage/Catalog/Model/Resource/Url.php
+++ b/app/code/community/Mage/Catalog/Model/Resource/Url.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Catalog
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -1448,3 +1448,4 @@ public function deleteRewriteRecord($requestPath, $storeId, $rp = false)
         $this->_getWriteAdapter()->delete($this->getMainTable(), $conditions);
     }
 }
+
diff --git a/app/code/community/Mage/Catalog/Model/Url.php b/app/code/community/Mage/Catalog/Model/Url.php
index 2d72319..8722635 100644
--- a/app/code/community/Mage/Catalog/Model/Url.php
+++ b/app/code/community/Mage/Catalog/Model/Url.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Catalog
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -602,12 +602,29 @@ public function clearStoreInvalidRewrites($storeId = null)
      *
      * Will try to get unique path by adding -1 -2 etc. between url_key and optional url_suffix
      *
+     * @deprecated use $this->getUnusedPathByUrlKey() instead
      * @param int $storeId
      * @param string $requestPath
      * @param string $idPath
      * @return string
      */
     public function getUnusedPath($storeId, $requestPath, $idPath)
+    {
+        return $this->getUnusedPathByUrlKey($storeId, $requestPath, $idPath, '');
+    }
+
+    /**
+     * Get requestPath that was not used yet.
+     *
+     * Will try to get unique path by adding -1 -2 etc. between url_key and optional url_suffix
+     *
+     * @param int $storeId
+     * @param string $requestPath
+     * @param string $idPath
+     * @param string $urlKey
+     * @return string
+     */
+    public function getUnusedPathByUrlKey($storeId, $requestPath, $idPath, $urlKey)
     {
         if (strpos($idPath, 'product') !== false) {
             $suffix = $this->getProductUrlSuffix($storeId);
@@ -645,21 +662,22 @@ public function getUnusedPath($storeId, $requestPath, $idPath)
             }
             // match request_url abcdef1234(-12)(.html) pattern
             $match = array();
-            $regularExpression = '#^([0-9a-z/-]+?)(-([0-9]+))?('.preg_quote($suffix).')?$#i';
+            $regularExpression = '#(?P<prefix>(.*/)?' . preg_quote($urlKey) . ')(-(?P<increment>[0-9]+))?(?P<suffix>'
+                . preg_quote($suffix) . ')?$#i';
             if (!preg_match($regularExpression, $requestPath, $match)) {
-                return $this->getUnusedPath($storeId, '-', $idPath);
+                return $this->getUnusedPathByUrlKey($storeId, '-', $idPath, $urlKey);
             }
-            $match[1] = $match[1] . '-';
-            $match[4] = isset($match[4]) ? $match[4] : '';
+            $match['prefix'] = $match['prefix'] . '-';
+            $match['suffix'] = isset($match['suffix']) ? $match['suffix'] : '';
 
             $lastRequestPath = $this->getResource()
-                ->getLastUsedRewriteRequestIncrement($match[1], $match[4], $storeId);
+                ->getLastUsedRewriteRequestIncrement($match['prefix'], $match['suffix'], $storeId);
             if ($lastRequestPath) {
-                $match[3] = $lastRequestPath;
+                $match['increment'] = $lastRequestPath;
             }
-            return $match[1]
-                . (isset($match[3]) ? ($match[3]+1) : '1')
-                . $match[4];
+            return $match['prefix']
+                . (isset($match['increment']) ? ($match['increment'] + 1) : '1')
+                . $match['suffix'];
         }
         else {
             return $requestPath;
@@ -699,7 +717,6 @@ public function getCategoryRequestPath($category, $parentPath)
     {
         $storeId = $category->getStoreId();
         $idPath  = $this->generatePath('id', null, $category);
-        $suffix  = $this->getCategoryUrlSuffix($storeId);
 
         if (isset($this->_rewrites[$idPath])) {
             $this->_rewrite = $this->_rewrites[$idPath];
@@ -713,42 +730,27 @@ public function getCategoryRequestPath($category, $parentPath)
             $urlKey = $this->getCategoryModel()->formatUrlKey($category->getUrlKey());
         }
 
-        $categoryUrlSuffix = $this->getCategoryUrlSuffix($category->getStoreId());
+        $categoryUrlSuffix = $this->getCategoryUrlSuffix($storeId);
         if (null === $parentPath) {
             $parentPath = $this->getResource()->getCategoryParentPath($category);
         }
         elseif ($parentPath == '/') {
             $parentPath = '';
         }
-        $parentPath = Mage::helper('catalog/category')->getCategoryUrlPath($parentPath,
-                                                                           true, $category->getStoreId());
+        $parentPath = Mage::helper('catalog/category')->getCategoryUrlPath($parentPath, true, $storeId);
 
         $requestPath = $parentPath . $urlKey;
-
-        if (isset($existingRequestPath) && $existingRequestPath == $requestPath . $suffix) {
+        $regexp = '/^' . preg_quote($requestPath, '/') . '(\-[0-9]+)?' . preg_quote($categoryUrlSuffix, '/') . '$/i';
+        if (isset($existingRequestPath) && preg_match($regexp, $existingRequestPath)) {
             return $existingRequestPath;
         }
 
-        if (isset($existingRequestPath) && $this->_checkExistingRequestPath($existingRequestPath, $category, $suffix, $requestPath)) {
-            return $existingRequestPath;
-        }
-
-        if ($this->_deleteOldTargetPath($requestPath, $idPath, $storeId)) {
+        $fullPath = $requestPath . $categoryUrlSuffix;
+        if ($this->_deleteOldTargetPath($fullPath, $idPath, $storeId)) {
             return $requestPath;
         }
 
-        $validatedPath = $this->getResource()->checkRequestPaths(
-            array($requestPath.$suffix, $requestPath.'-'.$category->getId().$suffix),
-            $storeId
-        );
-
-        if ($validatedPath) {
-            return $validatedPath;
-        }
-
-        return $this->getUnusedPath($category->getStoreId(), $requestPath,
-                                    $this->generatePath('id', null, $category)
-        );
+        return $this->getUnusedPathByUrlKey($storeId, $fullPath, $this->generatePath('id', null, $category), $urlKey);
     }
 
     /**
@@ -936,8 +938,8 @@ public function generatePath($type = 'target', $product = null, $category = null
                 $parentPath = Mage::helper('catalog/category')->getCategoryUrlPath($parentPath,
                     true, $category->getStoreId());
 
-                return $this->getUnusedPath($category->getStoreId(), $parentPath . $urlKey . $categoryUrlSuffix,
-                    $this->generatePath('id', null, $category)
+                return $this->getUnusedPathByUrlKey($category->getStoreId(), $parentPath . $urlKey . $categoryUrlSuffix,
+                    $this->generatePath('id', null, $category), $urlKey
                 );
             }
 
@@ -958,14 +960,15 @@ public function generatePath($type = 'target', $product = null, $category = null
                 $this->_addCategoryUrlPath($category);
                 $categoryUrl = Mage::helper('catalog/category')->getCategoryUrlPath($category->getUrlPath(),
                     false, $category->getStoreId());
-                return $this->getUnusedPath($category->getStoreId(), $categoryUrl . '/' . $urlKey . $productUrlSuffix,
-                    $this->generatePath('id', $product, $category)
+                return $this->getUnusedPathByUrlKey(
+                    $category->getStoreId(), $categoryUrl . '/' . $urlKey . $productUrlSuffix,
+                    $this->generatePath('id', $product, $category), $urlKey
                 );
             }
 
             // for product only
-            return $this->getUnusedPath($category->getStoreId(), $urlKey . $productUrlSuffix,
-                $this->generatePath('id', $product)
+            return $this->getUnusedPathByUrlKey(
+                $category->getStoreId(), $urlKey . $productUrlSuffix, $this->generatePath('id', $product), $urlKey
             );
         }
 
@@ -1011,3 +1014,4 @@ protected function _saveRewriteHistory($rewriteData, $rewrite)
         return $this;
     }
 }
+
diff --git a/app/code/community/Mage/CatalogRule/Model/Action/Index/Refresh.php b/app/code/community/Mage/CatalogRule/Model/Action/Index/Refresh.php
index cb3340e..3bdd15a 100644
--- a/app/code/community/Mage/CatalogRule/Model/Action/Index/Refresh.php
+++ b/app/code/community/Mage/CatalogRule/Model/Action/Index/Refresh.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/community/Mage/CatalogRule/Model/Rule.php b/app/code/community/Mage/CatalogRule/Model/Rule.php
index d228f64..20ce633 100644
--- a/app/code/community/Mage/CatalogRule/Model/Rule.php
+++ b/app/code/community/Mage/CatalogRule/Model/Rule.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_CatalogRule
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -311,6 +311,7 @@ protected function _getAllRules()
     {
         return $this->getResourceCollection()->getItems();
     }
+
     /**
      * Apply all price rules, invalidate related cache and refresh price index
      *
diff --git a/app/code/community/Mage/Core/Helper/Data.php b/app/code/community/Mage/Core/Helper/Data.php
index 220e23d..304004e 100644
--- a/app/code/community/Mage/Core/Helper/Data.php
+++ b/app/code/community/Mage/Core/Helper/Data.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Core
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -72,9 +72,6 @@ class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract
         Mage_Core_Model_Locale::FORMAT_TYPE_SHORT
     );
 
-    /** @var string $_moduleName Compatibility for translations, and maybe other stuff which uses module names. */
-    protected $_moduleName = 'Mage_Core';
-
 
     /**
      * @return Mage_Core_Model_Encryption
@@ -257,7 +254,7 @@ public function getRandomString($len, $chars = null)
             $chars = self::CHARS_LOWERS . self::CHARS_UPPERS . self::CHARS_DIGITS;
         }
         for ($i = 0, $str = '', $lc = strlen($chars)-1; $i < $len; $i++) {
-            $str .= $chars[mt_rand(0, $lc)];
+            $str .= $chars[random_int(0, $lc)];
         }
         return $str;
     }
@@ -273,11 +270,41 @@ public function getHash($password, $salt = false)
         return $this->getEncryptor()->getHash($password, $salt);
     }
 
+    /**
+     *  Generate password hash for user
+     *
+     * @param string $password
+     * @param mixed $salt
+     * @return string
+     */
+    public function getHashPassword($password, $salt = false)
+    {
+        $encryptionModel = $this->getEncryptor();
+        $latestVersionHash = $this->getVersionHash($encryptionModel);
+        if ($latestVersionHash == $encryptionModel::HASH_VERSION_SHA512) {
+            return $this->getEncryptor()->getHashPassword($password, $salt);
+        }
+        return $this->getEncryptor()->getHashPassword($password, Mage_Admin_Model_User::HASH_SALT_EMPTY);
+    }
+
     public function validateHash($password, $hash)
     {
         return $this->getEncryptor()->validateHash($password, $hash);
     }
 
+    /**
+     * Get encryption method depending on the presence of the function - password_hash.
+     *
+     * @param Mage_Core_Model_Encryption $encryptionModel
+     * @return int
+     */
+    public function getVersionHash(Mage_Core_Model_Encryption $encryptionModel)
+    {
+        return function_exists('password_hash')
+            ? $encryptionModel::HASH_VERSION_LATEST
+            : $encryptionModel::HASH_VERSION_SHA512;
+    }
+
     /**
      * Retrieve store identifier
      *
@@ -936,3 +963,4 @@ public function unEscapeCSVData($data)
         return $data;
     }
 }
+
diff --git a/app/code/community/Mage/Sales/Model/Config/Ordered.php b/app/code/community/Mage/Sales/Model/Config/Ordered.php
index 85881e8..650e0ac 100644
--- a/app/code/community/Mage/Sales/Model/Config/Ordered.php
+++ b/app/code/community/Mage/Sales/Model/Config/Ordered.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Sales
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/community/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/community/Mage/Sales/Model/Quote/Item/Abstract.php
index fc7d37f..ffea302 100644
--- a/app/code/community/Mage/Sales/Model/Quote/Item/Abstract.php
+++ b/app/code/community/Mage/Sales/Model/Quote/Item/Abstract.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Sales
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -814,3 +814,4 @@ protected function _calculatePrice($value, $saveTaxes = true)
         return $value;
     }
 }
+
diff --git a/app/code/community/Mage/Sales/Model/Resource/Order.php b/app/code/community/Mage/Sales/Model/Resource/Order.php
index 353136c..29c4d0c 100644
--- a/app/code/community/Mage/Sales/Model/Resource/Order.php
+++ b/app/code/community/Mage/Sales/Model/Resource/Order.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Sales
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -159,3 +159,4 @@ public function getIncrementId($orderId)
         return $adapter->fetchOne($select, $bind);
     }
 }
+
diff --git a/app/code/community/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/community/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 4d17693..3c33a5a 100644
--- a/app/code/community/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/community/Mage/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_SalesRule
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
@@ -149,3 +149,4 @@ protected function _validateQuote(Varien_Object $object)
         return $this->validateAttribute($total);
     }
 }
+
diff --git a/app/code/community/Mage/Uploader/Helper/File.php b/app/code/community/Mage/Uploader/Helper/File.php
index 3aad47d..074fc97 100644
--- a/app/code/community/Mage/Uploader/Helper/File.php
+++ b/app/code/community/Mage/Uploader/Helper/File.php
@@ -20,7 +20,7 @@
  *
  * @category    Mage
  * @package     Mage_Uploader
- * @copyright  Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/community/Varien/Simplexml/Element.php b/app/code/community/Varien/Simplexml/Element.php
index 92e2a4c..c2e62e9 100644
--- a/app/code/community/Varien/Simplexml/Element.php
+++ b/app/code/community/Varien/Simplexml/Element.php
@@ -20,7 +20,7 @@
  *
  * @category    Varien
  * @package     Varien_Simplexml
- * @copyright  Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (http://www.magento.com)
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 

From 006341c692862cb0b3614786a7bb726f36e8d293 Mon Sep 17 00:00:00 2001
From: Anton Samuelsson <samuelsson.anton@gmail.com>
Date: Thu, 16 Apr 2020 09:36:59 +0000
Subject: [PATCH 3/3] Updated readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12f1ede..02c4890 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Magento 1.9.3.6 Bugfixes
 
-This repo contains a variety of bug fixes for Magento Open Source version 1.9.3.6.
+This repo contains a variety of bug fixes for Magento Open Source version 1.9.4.4.
 At this moment, only version 1.9.3.6 is maintained. Some of these fixes might not work on different versions.
 
 To prevent confilicts with rewrites on existing projects, updated core files are moved into app/code/community/Mage and changed.