MFH: magic_quotes_runtime support is needed to have ext/dba being

superset of deprectaed ext/db

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 126319df6b2072533ee84bdf885a285f006da831..23679c065c2830ed412eeb5414d22a103d5a4bac 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -36,6 +36,7 @@
  
 #include "php_dba.h"
 #include "ext/standard/info.h"
+#include "ext/standard/php_string.h"
 
 #include "php_gdbm.h"
 #include "php_ndbm.h"
@@ -613,6 +614,9 @@ PHP_FUNCTION(dba_fetch)
                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Handler %s does not support optional skip parameter", info->hnd->name);
        }
        if((val = info->hnd->fetch(info, VALLEN(key), skip, &len TSRMLS_CC)) != NULL) {
+               if (val && PG(magic_quotes_runtime)) {
+                       val = php_addslashes(val, len, &len, 1 TSRMLS_CC);
+               }
                RETURN_STRINGL(val, len, 0);
        } 
        RETURN_FALSE;

diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 57166d56742ab44e2250b4852a6d6ce0afed0181..40a417860c26e21531e2b2ae333d576e49decb1b 100644 (file)
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -1,5 +1,7 @@
 --TEST--
 DBA CDB_MAKE handler test
+--INI--
+magic_quotes_runtime=1
 --SKIPIF--
 <?php 
        require_once('skipif.inc');