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

// Fix on htaccess generation

Browse Source
This commit is contained in:
rGaillard
2012-09-07 09:50:43 +00:00
parent 92b0574837
commit 02c7478b72
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+12 -12
View File
@@ -1570,18 +1570,18 @@ class ToolsCore
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z-]+)(-[0-9]+)?/.+\.jpg$ img/c/$1$2.jpg [L]'."\n");
}
// Redirections to dispatcher
if ($rewrite_settings)
{
fwrite($write_fd, "\n# Dispatcher\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, "RewriteRule ^.*$ - [NC,L]\n");
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, "RewriteRule ^.*\$ index.php [NC,L]\n");
}
}
// Redirections to dispatcher
if ($rewrite_settings)
{
fwrite($write_fd, "\n# Dispatcher\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, "RewriteRule ^.*$ - [NC,L]\n");
fwrite($write_fd, $domain_rewrite_cond);
fwrite($write_fd, "RewriteRule ^.*\$ index.php [NC,L]\n");
}
}
classes/shop/ShopUrl.php
+2 -2
View File
@@ -47,8 +47,8 @@ class ShopUrlCore extends ObjectModel
'fields' => array(
'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'main' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'domain' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 255),
'domain_ssl' => array('type' => self::TYPE_STRING, 'size' => 255),
'domain' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 255, 'validate' => 'isCleanHtml'),
'domain_ssl' => array('type' => self::TYPE_STRING, 'size' => 255, 'validate' => 'isCleanHtml'),
'id_shop' => array('type' => self::TYPE_INT, 'required' => true),
'physical_uri' => array('type' => self::TYPE_STRING, 'size' => 64),
'virtual_uri' => array('type' => self::TYPE_STRING, 'size' => 64),