diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-06-01 19:56:07 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-06-01 19:56:07 +0000 |
| commit | 663c13f39af9e50f59ee907ade4aaf4add0d8d01 (patch) | |
| tree | a860fcdbeadefcaec8d3dc2c59215d1751455784 /include/ws_functions.inc.php | |
| parent | cf32601902f8034e111196b4462ec30fb2d41577 (diff) | |
merge r6437 from trunk to branch 2.1
- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster)
git-svn-id: http://piwigo.org/svn/branches/2.1@6438 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/ws_functions.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index 32967fb5d..eee2c3f14 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -548,8 +548,8 @@ SELECT DISTINCT image_id } $comm = array( - 'author' => trim( stripslashes($params['author']) ), - 'content' => trim( stripslashes($params['content']) ), + 'author' => trim( $params['author'] ), + 'content' => trim( $params['content'] ), 'image_id' => $params['image_id'], ); @@ -1356,7 +1356,7 @@ function ws_session_getStatus($params, &$service) global $user; $res = array(); $res['username'] = is_a_guest() ? 'guest' : stripslashes($user['username']); - foreach ( array('status', 'template', 'theme', 'language') as $k ) + foreach ( array('status', 'theme', 'language') as $k ) { $res[$k] = $user[$k]; } |