diff --git a/.gitattributes b/.gitattributes index 9007145b63f462747fa5ba949068efc4a3e86aab..e92528e7b44062d75968db62dcba280cca35c414 100644 --- a/.gitattributes +++ b/.gitattributes @@ -421,7 +421,6 @@ ecrire/balise/url_.php -text ecrire/base/admin_repair.php -text ecrire/base/convert_sql_utf8.php -text ecrire/base/convert_utf8.php -text -ecrire/base/db_pg.php -text ecrire/base/delete_all.php -text ecrire/base/delete_statistiques.php -text ecrire/base/import_all.php -text @@ -701,6 +700,7 @@ ecrire/maj/v019.php -text ecrire/maj/v019_pre193.php -text ecrire/prive.php -text ecrire/public/index.php -text +ecrire/req/pg.php -text ecrire/rien.gif -text ecrire/typographie/en.php -text ecrire/typographie/fr.php -text diff --git a/ecrire/base/convert_sql_utf8.php b/ecrire/base/convert_sql_utf8.php index ad85713c3dee955435967841dbf870555e0ee2e8..152513058286f6f1cec1bd605bf377310bc9efdd 100644 --- a/ecrire/base/convert_sql_utf8.php +++ b/ecrire/base/convert_sql_utf8.php @@ -35,8 +35,6 @@ function base_convert_sql_utf8_dist($titre, $reprise=false) // http://doc.spip.org/@convert_sql_utf8 function convert_sql_utf8(){ - include_spip('base/db_mysql'); - include_spip('base/abstract_sql'); define(_DEBUG_CONVERT, false); $charset_spip = $GLOBALS['meta']['charset']; diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index cf10ec7661d72b60e228fe35576b665a721a2c60..825a4524f375309368483829a5f3bbceb3d9ffc4 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -214,9 +214,9 @@ function spip_connect_db($host, $port, $login, $pass, $db='', $type='mysql', $pr if (!$prefixe) $prefixe = isset($GLOBALS['table_prefix']) ? $GLOBALS['table_prefix'] : $db; - $h = charger_fonction($g = 'db_' . $type, 'base', true); + $h = charger_fonction($type, 'req', true); if (!$h) { - spip_log("$g est indefinie"); + spip_log("les reqûetes $type ne sont pas fournies"); return; } diff --git a/ecrire/base/db_mysql.php b/ecrire/req/mysql.php similarity index 99% rename from ecrire/base/db_mysql.php rename to ecrire/req/mysql.php index 74c8b22618b5ff88711802de94ac9567304eae19..b5360f2c8582ae645c4afa3d30ccade85bb1ea33 100644 --- a/ecrire/base/db_mysql.php +++ b/ecrire/req/mysql.php @@ -15,7 +15,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; // fonction pour la premiere connexion a un serveur MySQL // http://doc.spip.org/@base_db_mysql_dist -function base_db_mysql_dist($host, $port, $login, $pass, $db='', $prefixe='', $ldap='') { +function req_mysql_dist($host, $port, $login, $pass, $db='', $prefixe='', $ldap='') { if ($port > 0) $host = "$host:$port"; $link = mysql_connect($host, $login, $pass); diff --git a/ecrire/base/db_pg.php b/ecrire/req/pg.php similarity index 99% rename from ecrire/base/db_pg.php rename to ecrire/req/pg.php index 8dd975ed516b5124da1bbd52a65c81f6d10d7150..abe5bf51192a6c0de8b60c9eee375d8b3a735a54 100644 --- a/ecrire/base/db_pg.php +++ b/ecrire/req/pg.php @@ -22,7 +22,7 @@ define('_DEFAULT_DB', 'spip'); // si ca ne marche toujours pas, echec. // http://doc.spip.org/@base_db_pg_dist -function base_db_pg_dist($addr, $port, $login, $pass, $db='', $prefixe='', $ldap='') { +function req_pg_dist($addr, $port, $login, $pass, $db='', $prefixe='', $ldap='') { @list($host, $p) = split(';', $addr); if ($p >0) $port = " port=$p" ; else $port = '';