[SPIP] ~maj 3.0.10 --> 3.0.14

[lhc/web/www.git] / www / ecrire / inc / install.php

diff --git a/www/ecrire/inc/install.php b/www/ecrire/inc/install.php
index b348da6..e92ccd3 100644 (file)
--- a/www/ecrire/inc/install.php
+++ b/www/ecrire/inc/install.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2012                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -467,20 +467,20 @@ function predef_ou_cache($adresse_db, $login_db, $pass_db, $server_db)
 {
        return ((defined('_INSTALL_HOST_DB'))
                ? ''
-               : "\n<input type='hidden' name='adresse_db'  value=\"".htmlspecialchars($adresse_db)."\" />"
+               : "\n<input type='hidden' name='adresse_db'  value=\"".spip_htmlspecialchars($adresse_db)."\" />"
        )
        . ((defined('_INSTALL_USER_DB'))
                ? ''
-               : "\n<input type='hidden' name='login_db' value=\"".htmlspecialchars($login_db)."\" />"
+               : "\n<input type='hidden' name='login_db' value=\"".spip_htmlspecialchars($login_db)."\" />"
        )
        . ((defined('_INSTALL_PASS_DB'))
                ? ''
-               : "\n<input type='hidden' name='pass_db' value=\"".htmlspecialchars($pass_db)."\" />"
+               : "\n<input type='hidden' name='pass_db' value=\"".spip_htmlspecialchars($pass_db)."\" />"
        )
 
        . ((defined('_INSTALL_SERVER_DB'))
                ? ''
-               : "\n<input type='hidden' name='server_db' value=\"".htmlspecialchars($server_db)."\" />"
+               : "\n<input type='hidden' name='server_db' value=\"".spip_htmlspecialchars($server_db)."\" />"
           );
 }
 
@@ -494,7 +494,7 @@ function install_etape_liste_bases($server_db, $login_db, $disabled=array())
        if (!$noms) return '';
 
        foreach ($noms as $nom){
-               $id = htmlspecialchars($nom);
+               $id = spip_htmlspecialchars($nom);
                $dis = in_array($nom, $disabled) ? " disabled='disabled'" : '';
                $base = " name=\"choix_db\" value=\""
                  . $nom
@@ -525,7 +525,7 @@ function install_propager($hidden)
 {
        $res = '';
        foreach($hidden as $k) {
-               $v = htmlentities(_request($k));
+               $v = spip_htmlentities(_request($k));
                $res .= "<input type='hidden' name='$k' value='$v' />";
        }
        return $res;