Skip to content

Commit

Permalink
refactor: Replace sSYSTEM->sCONFIG calls in export
Browse files Browse the repository at this point in the history
  • Loading branch information
aragon999 committed Aug 6, 2023
1 parent 60b5ebf commit 62ff28a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions engine/Shopware/Core/sExport.php
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public function sInitSettings()

$this->shop = $shop;

$this->sSYSTEM->sCONFIG = Shopware()->Config();
$this->sSYSTEM->sCONFIG = $this->config;
}

/**
Expand All @@ -378,7 +378,7 @@ public function sInitSmarty()
$this->sSmarty->registerPlugin('modifier', 'shippingcost', [$this, 'sGetArticleShippingcost']);
$this->sSmarty->registerPlugin('modifier', 'property', [$this, 'sGetArticleProperties']);

$this->sSmarty->assign('sConfig', $this->sSYSTEM->sCONFIG);
$this->sSmarty->assign('sConfig', $this->config);
$this->sSmarty->assign('shopData', $this->shopData);
$this->sSmarty->assign('sCurrency', $this->sCurrency);
$this->sSmarty->assign('sCustomergroup', $this->sCustomergroup);
Expand Down Expand Up @@ -557,7 +557,7 @@ public function sEscapeString($string, $esc_type = '', $char_set = null)
*/
public function sGetArticleLink($articleID, $title = '')
{
return Shopware()->Modules()->Core()->sRewriteLink($this->sSYSTEM->sCONFIG['sBASEFILE'] . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID']));
return Shopware()->Modules()->Core()->sRewriteLink($this->config->get('sBASEFILE') . "?sViewport=detail&sArticle=$articleID", $title) . (empty($this->sSettings['partnerID']) ? '' : '?sPartner=' . urlencode($this->sSettings['partnerID']));
}

/**
Expand Down Expand Up @@ -1446,8 +1446,8 @@ public function sGetDispatch($dispatch = null, $country = null)
public function sGetDispatchBasket($article, $countryID = null, $paymentID = null)
{
$sql_select = '';
if (!empty($this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT'])) {
$sql_select .= ', ' . $this->sSYSTEM->sCONFIG['sPREMIUMSHIPPIUNGASKETSELECT'];
if (!empty($this->config->get('sPREMIUMSHIPPIUNGASKETSELECT'))) {
$sql_select .= ', ' . $this->config->get('sPREMIUMSHIPPIUNGASKETSELECT');
}
$sql = 'SELECT id, calculation_sql FROM s_premium_dispatch WHERE calculation=3';
$calculations = $this->db->fetchPairs($sql);
Expand Down

0 comments on commit 62ff28a

Please sign in to comment.