Merge pull request #232 from magento-goinc/MAGETWO-44074

[GITHUB] Bugs fixing
magento · Dec 9, 2015 · c334bf2 · c334bf2
2 parents 2f74e09 + 8235d5b
commit c334bf2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -35,6 +35,11 @@ class Suffix extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\DB\Adapter\AdapterInterface */
     protected $connection;
 
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    protected $resource;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -67,6 +72,7 @@ public function __construct(
         $this->connection = $appResource->getConnection();
         $this->urlFinder = $urlFinder;
         $this->storeManager = $storeManager;
+        $this->resource = $appResource;
     }
 
     /**
@@ -118,7 +124,7 @@ protected function updateSuffixForUrlRewrites()
                 ? [UrlRewrite::REQUEST_PATH => preg_replace($oldSuffixPattern, $suffix, $urlRewrite->getRequestPath())]
                 : [UrlRewrite::TARGET_PATH => preg_replace($oldSuffixPattern, $suffix, $urlRewrite->getTargetPath())];
             $this->connection->update(
-                DbStorage::TABLE_NAME,
+                $this->resource->getTableName(DbStorage::TABLE_NAME),
                 $bind,
                 $this->connection->quoteIdentifier(UrlRewrite::URL_REWRITE_ID) . ' = ' . $urlRewrite->getUrlRewriteId()
             );

diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
@@ -112,7 +112,7 @@ protected function doGetMaxRegularAmount()
     public function getMinRegularAmount()
     {
         if (null === $this->minRegularAmount) {
-            $this->minRegularAmount = $this->doGetMinRegularAmount() ?: false;
+            $this->minRegularAmount = $this->doGetMinRegularAmount() ?: parent::getAmount();
         }
         return $this->minRegularAmount;
     }