git://git.iain.cx/iain
/
readifood.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting in get_order_parcel_string().
[readifood.git]
/
lib
/
functions.php
diff --git
a/lib/functions.php
b/lib/functions.php
index
fe442f8
..
ecaf2ad
100644
(file)
--- a/
lib/functions.php
+++ b/
lib/functions.php
@@
-219,7
+219,7
@@
function get_order_parcel_string($order) {
global $parcel_sizes, $parcel_contents;
function get_order_parcel_string($order) {
global $parcel_sizes, $parcel_contents;
- $parcel_size =
""
;
+ $parcel_size =
null
;
for ($i = 0 ; $i < count($parcel_sizes); $i++) {
if ($order->getParcel() & (1 << $i)) {
$parcel_size = $parcel_sizes[$i];
for ($i = 0 ; $i < count($parcel_sizes); $i++) {
if ($order->getParcel() & (1 << $i)) {
$parcel_size = $parcel_sizes[$i];
@@
-232,7
+232,11
@@
if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
}
if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
}
- return implode(": ", array($parcel_size, implode(", ", $selected)));
+ $ret = implode(": ", array($parcel_size, implode(", ", $selected)));
+ $ret = preg_replace('/^: /', '', $ret);
+ $ret = preg_replace('/: $/', '', $ret);
+
+ return $ret;
}
function get_order_displayname($order) {
}
function get_order_displayname($order) {