浏览代码

Fix frontend email text separator

ohartl 9 年之前
父节点
当前提交
342e0d510f
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      include/php/pages/admin/deleteredirect.php
  2. 2 2
      include/php/pages/admin/listredirects.php

+ 2 - 2
include/php/pages/admin/deleteredirect.php

@@ -56,12 +56,12 @@ else{
 	<form class="form" action="" method="post">
 		<div class="input-group">
 			<label>Source</label>
-			<div class="input-info"><?php echo formatEmails($redirect->getSource(), FRONTEND_EMAIL_SEPARATOR_TEXT); ?></div>
+			<div class="input-info"><?php echo formatEmails($redirect->getSource(), str_replace(PHP_EOL, '<br>', FRONTEND_EMAIL_SEPARATOR_TEXT)); ?></div>
 		</div>
 
 		<div class="input-group">
 			<label>Destination</label>
-			<div class="input-info"><?php echo formatEmails($redirect->getDestination(), FRONTEND_EMAIL_SEPARATOR_TEXT); ?></div>
+			<div class="input-info"><?php echo formatEmails($redirect->getDestination(), str_replace(PHP_EOL, '<br>', FRONTEND_EMAIL_SEPARATOR_TEXT)); ?></div>
 		</div>
 
 		<div class="input-group">

+ 2 - 2
include/php/pages/admin/listredirects.php

@@ -34,8 +34,8 @@ $redirects = AbstractRedirect::findMultiAll();
 	<tbody>
 	<?php foreach($redirects as $redirect): /** @var AbstractRedirect $redirect */ ?>
 		<tr>
-			<td><?php echo formatEmails($redirect->getSource(), FRONTEND_EMAIL_SEPARATOR_TEXT); ?></td>
-			<td><?php echo formatEmails($redirect->getDestination(), FRONTEND_EMAIL_SEPARATOR_TEXT); ?></td>
+			<td><?php echo formatEmails($redirect->getSource(), str_replace(PHP_EOL, '<br>', FRONTEND_EMAIL_SEPARATOR_TEXT)); ?></td>
+			<td><?php echo formatEmails($redirect->getDestination(), str_replace(PHP_EOL, '<br>', FRONTEND_EMAIL_SEPARATOR_TEXT)); ?></td>
 			<td>
 				<a href="<?php echo url('admin/editredirect/?id='.$redirect->getId()); ?>">[Edit]</a>
 			</td>