Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
2 catalog/admin/define_language.php
@@ -94,7 +94,7 @@ function tep_opendir($path) {
<tr><?php echo tep_draw_form('lng', FILENAME_DEFINE_LANGUAGE, '', 'get'); ?>
<td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
<td class="pageHeading" align="right"><?php echo tep_draw_separator('pixel_trans.gif', '1', HEADING_IMAGE_HEIGHT); ?></td>
- <td class="pageHeading" align="right"><?php echo tep_draw_pull_down_menu('lngdir', $languages_array, $language, 'onchange="this.form.submit();"'); ?></td>
+ <td class="pageHeading" align="right"><?php echo tep_draw_pull_down_menu('lngdir', $languages_array, $HTTP_GET_VARS['lngdir'], 'onchange="this.form.submit();"'); ?></td>
<?php echo tep_hide_session_id(); ?></form></tr>
</table></td>
</tr>
View
3 catalog/admin/includes/functions/general.php
@@ -31,6 +31,9 @@ function tep_redirect($url) {
tep_redirect(tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false));
}
+ if ( strpos($url, '&amp;') !== false ) {
+ $url = str_replace('&amp;', '&', $url);
+ }
header('Location: ' . $url);
if (STORE_PAGE_PARSE_TIME == 'true') {
View
2 catalog/admin/mail.php
@@ -44,7 +44,7 @@
if (EMAIL_USE_HTML == 'true') {
$mimemessage->add_html($message, $text);
} else {
- $mimemessage->add_text($message);
+ $mimemessage->add_text($text);
}
$mimemessage->build_message();
View
2 catalog/checkout_process.php
@@ -155,7 +155,7 @@
WHERE p.products_id = '" . tep_get_prid($order->products[$i]['id']) . "'";
// Will work with only one option for downloadable products
// otherwise, we have to build the query dynamically with a loop
- $products_attributes = $order->products[$i]['attributes'];
+ $products_attributes = (isset($order->products[$i]['attributes'])) ? $order->products[$i]['attributes'] : '';
if (is_array($products_attributes)) {
$stock_query_raw .= " AND pa.options_id = '" . $products_attributes[0]['option_id'] . "' AND pa.options_values_id = '" . $products_attributes[0]['value_id'] . "'";
}
View
3 catalog/includes/functions/general.php
@@ -42,6 +42,9 @@ function tep_redirect($url) {
}
}
+ if ( strpos($url, '&amp;') !== false ) {
+ $url = str_replace('&amp;', '&', $url);
+ }
header('Location: ' . $url);
tep_exit();
View
2 catalog/install/templates/main_page.php
@@ -15,7 +15,7 @@
<html>
<head>
-
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>osCommerce, Open Source E-Commerce Solutions</title>
<meta name="robots" content="noindex,nofollow">

No commit comments for this range

Something went wrong with that request. Please try again.