Merge pull request #623 from Hrumpa/patch-1

Possible division by zero at Weight::convert()
opencart · Apr 16, 2013 · 521b748 · 521b748
2 parents e5b72a7 + 5795d70
commit 521b748
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/upload/system/library/weight.php b/upload/system/library/weight.php
@@ -26,13 +26,13 @@ public function convert($value, $from, $to) {
 		if (isset($this->weights[$from])) {
 			$from = $this->weights[$from]['value'];
 		} else {
-			$from = 0;
+			$from = 1;
 		}
 
 		if (isset($this->weights[$to])) {
 			$to = $this->weights[$to]['value'];
 		} else {
-			$to = 0;
+			$to = 1;
 		}
 
 		return $value * ($to / $from);
@@ -54,4 +54,4 @@ public function getUnit($weight_class_id) {
 		}
 	}
 }
-?>
+?>