Ticket #646: 646-jForms-jTpl-html-plugins-textarea-should-render-linebreaks.diff
| File 646-jForms-jTpl-html-plugins-textarea-should-render-linebreaks.diff, 2.2 kB (added by Julien, 6 months ago) |
|---|
-
lib/jelix/plugins/tpl/html/function.formdatafull.php
old new 3 3 * @package jelix 4 4 * @subpackage jtpl_plugin 5 5 * @author Laurent Jouanneau 6 * @contributor Dominique Papin 6 * @contributor Dominique Papin, Julien Issler 7 7 * @copyright 2007-2008 Laurent Jouanneau, 2007 Dominique Papin 8 * @copyright 2008 Julien Issler 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 10 11 */ … … 33 34 $s.=','.htmlspecialchars($v); 34 35 } 35 36 echo substr($s, 1); 36 }elseif($ctrl->datatype instanceof jDatatypeHtml) {37 }elseif($ctrl->datatype instanceof jDatatypeHtml) 37 38 echo $value; 38 }else 39 else if($ctrl->type == 'textarea') 40 echo nl2br(htmlspecialchars($value)); 41 else 39 42 echo htmlspecialchars($value); 40 43 41 44 echo '</td></tr>'; -
lib/jelix/plugins/tpl/html/function.ctrl_value.php
old new 3 3 * @package jelix 4 4 * @subpackage jtpl_plugin 5 5 * @author Laurent Jouanneau 6 * @contributor Dominique Papin 6 * @contributor Dominique Papin, Julien Issler 7 7 * @copyright 2007-2008 Laurent Jouanneau, 2007 Dominique Papin 8 * @copyright 2008 Julien Issler 8 9 * @link http://www.jelix.org 9 10 * @licence GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 10 11 */ … … 53 54 $s.=$sep.htmlspecialchars($v); 54 55 } 55 56 echo substr($s, strlen($sep)); 56 }elseif($ctrl->datatype instanceof jDatatypeHtml) {57 }elseif($ctrl->datatype instanceof jDatatypeHtml) 57 58 echo $value; 58 }else 59 else if($ctrl->type == 'textarea') 60 echo nl2br(htmlspecialchars($value)); 61 else 59 62 echo htmlspecialchars($value); 60 63 }
