Remove wrong strip_tags and fix formatting in addressbook.php.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7718 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 5a1f8eefa0fc75edb2f2bac89dfd191a7ea96e08..37b8cf2975ca1522f826ee01b62acdb1fe01c5a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,7 @@ Version 1.5.1 -- CVS
     of read_body.php discovered by Roman Medina.
   - Get alternating row colors of addressbook in sync with mailbox list.
   - Give proper error when PEAR DB not found.
+  - Remove inappropriate strip_tags() from add-to-addressbook (#968475).
 
 Version 1.5.0
 --------------------

diff --git a/src/addressbook.php b/src/addressbook.php
index 61eeeccd0c40b396eaa16719927c468dd864f99c..294eab7fec8d200125a1e073a509ce9f04b34f3c 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -162,14 +162,11 @@ if(sqgetGlobalVar('REQUEST_METHOD', $req_method, SQ_SERVER) && $req_method == 'P
      * Add new address                                *
      **************************************************/
     if (isset($addaddr)) {
-        foreach( $addaddr as $k => $adr ) {
-            $addaddr[$k] = strip_tags( $adr );
+        if (isset($backend)) {
+            $r = $abook->add($addaddr, $backend);
+        } else {
+            $r = $abook->add($addaddr, $abook->localbackend);
         }
-    if (isset($backend)) {
-      $r = $abook->add($addaddr, $backend);
-    } else {
-      $r = $abook->add($addaddr, $abook->localbackend);
-    }
 
         /* Handle error messages */
         if (!$r) {