Skip to content

Commit b2e122b

Browse files
authored
Merge branch 'main' into 4069-Bug-on-created_at-in-customer_entity-table-on-update
2 parents 55285d7 + 7ec8830 commit b2e122b

File tree

34 files changed

+35
-35
lines changed

34 files changed

+35
-35
lines changed

app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function getRate(Mage_Shipping_Model_Rate_Request $request)
127127
$conditions[] = "dest_country_id = '0' AND dest_region_id = '0' AND dest_zip = '*'";
128128

129129
$i = 0;
130-
$postcode = $request->getDestPostcode();
130+
$postcode = (string)$request->getDestPostcode();
131131
while (strlen($postcode) > 1) {
132132
$i++;
133133
$postcode = substr($postcode, 0, -1);

js/tinymce/models/dom/model.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tinymce/plugins/accordion/plugin.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tinymce/plugins/advlist/plugin.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)