Permalink
Browse files

Merge branch 'master' of https://github.com/osCommerce/oscommerce.git

Conflicts:
	osCommerce/OM/Core/Site/Setup/Application/Install/pages/step_3.php
  • Loading branch information...
2 parents d9845b0 + 80b9ccf commit 94eb5964e75046383f445a0485ca5d28a6e78d08 @dannyhenderson committed Apr 1, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 osCommerce/OM/Core/Site/Setup/Application/Install/pages/step_3.php
@@ -97,10 +97,10 @@
https_cookie_path = '$http_dir_ws'
dir_ws_http_server = '$http_dir_ws'
dir_ws_https_server = '$http_dir_ws'
-product_images_http_server = '$http_server'
-product_images_https_server = '$http_server'
-product_images_dir_ws_http_server = '$http_dir_ws/public/products/'
-product_images_dir_ws_https_server = '$http_dir_ws/public/products/'
+product_images_http_server = ''
+product_images_https_server = ''
+product_images_dir_ws_http_server = '{$http_dir_ws}public/products/'
+product_images_dir_ws_https_server = '{$http_dir_ws}public/products/'
db_server = '{$_POST['DB_SERVER']}'
db_server_username = '{$_POST['DB_SERVER_USERNAME']}'
db_server_password = '{$_POST['DB_SERVER_PASSWORD']}'

0 comments on commit 94eb596

Please sign in to comment.