aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-11-15 09:48:47 +0000
committerplegall <plg@piwigo.org>2010-11-15 09:48:47 +0000
commit4ae463a2fb56de6476df7c70b852ba7425fa843f (patch)
treeb93db10359bcc89f328364692badf139c03212a9
parent81dfe1f5c881e51c2f158b8025c4484ed6514eab (diff)
merge r7781 from branch 2.1 to trunk
bug 2035 fixed: avoid sending multiple line error code in HTTP header. This was breaking the JSON parsing on pwg.images.addComment response from Piwigo because of an raw HTML warning. git-svn-id: http://piwigo.org/svn/trunk@7782 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/ws_functions.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 4cc9fff20..24d8e25ae 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -580,7 +580,7 @@ SELECT DISTINCT image_id
{
case 'reject':
array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
- return new PwgError(403, implode("\n", $infos) );
+ return new PwgError(403, implode("; ", $infos) );
case 'validate':
case 'moderate':
$ret = array(