dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSCFV-4440

Browse Source
This commit is contained in:
rGaillard
2012-09-28 14:42:30 +00:00
parent 8e28baf877
commit c0e85662ea
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+4 -1
View File
@@ -1530,6 +1530,9 @@ class ToolsCore
if ($medias[2] != '') if ($medias[2] != '')
$media_domains .= 'RewriteCond %{HTTP_HOST} ^'.$medias[2].'$ [OR]'."\n"; $media_domains .= 'RewriteCond %{HTTP_HOST} ^'.$medias[2].'$ [OR]'."\n";
if (Configuration::get('PS_WEBSERVICE_CGI_HOST'))
fwrite($write_fd, "RewriteCond %{HTTP:Authorization} ^(.*)\nRewriteRule . - [E=HTTP_AUTHORIZATION:%1]\n\n");
foreach ($domains as $domain => $list_uri) foreach ($domains as $domain => $list_uri)
{ {
$physicals = array(); $physicals = array();
@@ -1539,7 +1542,7 @@ class ToolsCore
fwrite($write_fd, 'RewriteRule . - [E=REWRITEBASE:'.$uri['physical'].']'."\n"); fwrite($write_fd, 'RewriteRule . - [E=REWRITEBASE:'.$uri['physical'].']'."\n");
// Webservice // Webservice
fwrite($write_fd, 'RewriteRule ^api/?(.*)$ '."%{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]\n\n"); fwrite($write_fd, 'RewriteRule ^api/?(.*)$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]'."\n\n");
$rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS', null, null, (int)$uri['id_shop']); $rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS', null, null, (int)$uri['id_shop']);
$domain_rewrite_cond = 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n"; $domain_rewrite_cond = 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n";
controllers/admin/AdminWebserviceController.php
+6
View File
@@ -94,6 +94,12 @@ class AdminWebserviceControllerCore extends AdminController
parent::__construct(); parent::__construct();
} }
protected function processUpdateOptions()
{
parent::processUpdateOptions();
Tools::generateHtaccess();
}
public function renderForm() public function renderForm()
{ {
$this->fields_form = array( $this->fields_form = array(