Bug#318633: Additional patch

[Neil McGovern]

Please find attached a second patch to fix B1 of the issue.

Neil
-- 
A. Because it breaks the logical sequence of discussion
Q. Why is top posting bad?
gpg key - http://www.halon.org.uk/pubkey.txt ; the.earth.li B345BDD3

--- address_tools.p3    2003-04-02 06:48:18.000000000 +0100
+++ address_tools.p3    2006-02-12 21:15:50.860204360 +0000
@@ -36,11 +36,11 @@
          } elseif ( $name == "email_2" ) {
            echo AsEmail($l->$name,$l->$name,$a->getFullname());
          } elseif ( $name == "phone_1" ) {
-           echo handle('phone',$l,$l->$name);
+           echo handle('phone',$l,myentities($l->$name));
          } elseif ( $name == "phone_2" ) {
-           echo handle('phone',$l,$l->$name);
+           echo handle('phone',$l,myentities($l->$name));
          } elseif ( $name == "fax_1" ) {
-           echo handle('fax',$l,$l->$name);
+           echo handle('fax',$l,myentities($l->$name));
          } elseif ( $name == "c_id" ) {
            echo $l->company->getLink();
          } elseif ( $name == "d_id" ) {
@@ -52,7 +52,7 @@
              echo $l->$name;
            }
          } elseif ( $name == "city" ) {
-           echo handle('city',$l,$l->$name);
+           echo handle('city',$l,myentities($l->$name));
          } elseif ( $name == "lname" ) {
            $url =  "address_show.php";
            $url = addUrlParameter($url,"lid=". $l->id);
@@ -431,4 +431,4 @@
 
    echo $layout->OverviewTableEnd();
  }
-?>
\ No newline at end of file
+?>

--- address_show.php    2003-08-13 05:25:43.000000000 +0100
+++ address_show.php    2006-02-12 21:11:58.017601816 +0000
@@ -161,7 +161,7 @@
        $this->format = "html";
      } else {
        $this->obj->read_locs_data();
-       $this->name = $lang['AddressDetail'].": ".$this->obj->getFullName();
+       $this->name = $lang['AddressDetail'].": 
".myentities($this->obj->getFullName());
         }
      # Menu      
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);