Merge branch 'MAGETWO-44997' into MAGETWO-44074

magento · Dec 8, 2015 · 42f74cc · 42f74cc
2 parents fa41dfd + bcd9365
commit 42f74cc
Showing 1 changed file with 7 additions and 1 deletion.
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\Resource
+     */
+    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()
             );