|
@@ -45,7 +45,8 @@ discard block |
|
|
block discarded – undo |
|
45
|
45
|
<span class="navbar-label"> |
|
46
|
46
|
<?php if( $this->get( 'itemData/subscription.id' ) ) : ?> |
|
47
|
47
|
<?= $enc->html( $this->get( 'itemData/subscription.datenext' ) . ' ' . $this->get( 'itemData/subscription.interval' ) ) ?> |
|
48
|
|
- <?php else : ?> |
|
|
48
|
+ <?php else { |
|
|
49
|
+ : ?> |
|
49
|
50
|
<?= $enc->html( $this->translate( 'admin', 'New' ) ) ?> |
|
50
|
51
|
<?php endif ?> |
|
51
|
52
|
</span> |
|
@@ -324,6 +325,7 @@ discard block |
|
|
block discarded – undo |
|
324
|
325
|
\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, |
|
325
|
326
|
\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MS, |
|
326
|
327
|
); |
|
|
328
|
+} |
|
327
|
329
|
|
|
328
|
330
|
echo preg_replace( "/\n+/m", "<br/>", trim( $enc->html( sprintf( |
|
329
|
331
|
/// Address format with company (%1$s), salutation (%2$s), title (%3$s), first name (%4$s), last name (%5$s), |
Please login to merge, or discard this patch.