tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-08-19 Miguel de Dios <miguel.dedios@artica.es> 

* general/logon_ok.php, godmode/setup/news.php: fixed the lost
	"<br>" in the news.
	
	Fixes: #2380




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8675 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-19 06:49:17 +00:00
parent 59a8bc9c60
commit de3742d915
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-08-19 Miguel de Dios <miguel.dedios@artica.es>
* general/logon_ok.php, godmode/setup/news.php: fixed the lost
"<br>" in the news.
Fixes: #2380
2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/module_manager_editor.php,

15
pandora_console/general/logon_ok.php
View File

@ -44,10 +44,16 @@ echo '<div style="width:50%; float:left;" id="leftcolumn">';
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$sql = "SELECT subject,timestamp,text,author FROM tnews ORDER by timestamp DESC LIMIT 3";
$sql = "SELECT subject,timestamp,text,author
FROM tnews
ORDER BY timestamp DESC
LIMIT 3";
break;
case "oracle":
$sql = "SELECT subject,timestamp,text,author FROM tnews where rownum <= 3 ORDER by timestamp DESC";
$sql = "SELECT subject,timestamp,text,author
FROM tnews
WHERE rownum <= 3
ORDER BY timestamp DESC";
break;
}
@ -62,10 +68,13 @@ echo '<div style="width:50%; float:left;" id="leftcolumn">';
$comparation_suffix = __('ago');
}
foreach ($news as $article) {
$text = io_safe_output($article["text"]);
echo '<tr><th><b>'.$article["subject"].'</b></th></tr>';
echo '<tr><td>'.__('by').' <b>'.$article["author"].'</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . $comparation_suffix . '</td></tr>';
echo '<tr><td class="datos">';
echo nl2br ($article["text"]);
echo nl2br($text);
echo '</td></tr>';
}
echo '</table>';

2
pandora_console/godmode/setup/news.php
View File

@ -56,7 +56,7 @@ if (isset ($_POST["update"])) { // if update
$values = array('subject' => $subject, 'text' => $text, 'timestamp' => $timestamp);
$result = db_process_sql_update('tnews', $values, array('id_news' => $id_news));
ui_print_result_message ($result,
__('Successfully updated'),
__('Not updated. Error updating data'));