Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2100 → Rev 2101

/trunk/jrest/lib/Bdd2.php
79,8 → 79,18
public function proteger($chaine) {
return $this->quote($chaine);
}
public function protegerTableau(Array $tableau) {
foreach ($tableau as $id => $val) {
if (is_array($val)) {
$tableau[$id] = $this->protegerTableau($val);
} else {
$tableau[$id] = $this->proteger($val);
}
}
return $tableau;
}
 
 
public function executerRequeteSimple($requete) {
$resultat = false;
try {
Property changes:
Added: svn:mergeinfo
Merged /branches/v1.7-croissant/jrest/lib/Bdd2.php:r1855,1879-1880,1885-1886,1917,1923,1983
Merged /branches/v2.0-elagueuse/jrest/lib/Bdd2.php:r2099-2100
Merged /branches/topic-dbsingleton/jrest/lib/Bdd2.php:r1720-1764
Merged /branches/v1.8-debroussailleuse/jrest/lib/Bdd2.php:r1981,1987,1992