Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

757
 
1319
 
1319
 
mysql.php
_> 11 <?php
  22 /*
<> 3 -  $Id: mysql.php 757 2006-08-23 12:22:54Z hpdl $
   3+  $Id: mysql.php 1319 2007-03-05 20:43:07Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
  77 
<> 8 -  Copyright (c) 2004 osCommerce
   8+  Copyright (c) 2006 osCommerce
99 
  1010   Released under the GNU General Public License
  1111 */
  1212 
<> 13 -  if (!function_exists('mysql_fetch_assoc')) {
  14 -    function mysql_fetch_assoc($resource) {
  15 -      return mysql_fetch_array($resource, MYSQL_ASSOC);
  16 -    }
  17 -  }
  18 -
1913   class osC_Database_mysql extends osC_Database {
<> 20 -    var $sql_parse_string = 'addslashes',
  21 -        $sql_parse_string_with_connection_handler = false,
  22 -        $use_transactions = false,
   14+    var $use_transactions = false,
2315         $use_fulltext = false,
<> 24 -        $use_fulltext_boolean = false;
   16+        $use_fulltext_boolean = false,
   17+        $sql_parse_string = 'mysql_escape_string',
   18+        $sql_parse_string_with_connection_handler = false;
2519 
  2620     function osC_Database_mysql($server, $username, $password) {
  2721       $this->server = $server;
     
 !
3125       if (function_exists('mysql_real_escape_string')) {
  3226         $this->sql_parse_string = 'mysql_real_escape_string';
  3327         $this->sql_parse_string_with_connection_handler = true;
<> 34 -      } elseif (function_exists('mysql_escape_string')) {
  35 -        $this->sql_parse_string = 'mysql_escape_string';
3628       }
  3729 
  3830       if ($this->is_connected === false) {
     
 !
8476       }
  8577     }
  8678 
<>  79+    function parseString($value) {
   80+      if ($this->sql_parse_string_with_connection_handler === true) {
   81+        return call_user_func_array($this->sql_parse_string, array($value, $this->link));
   82+      } else {
   83+        return call_user_func_array($this->sql_parse_string, array($value));
   84+      }
   85+    }
   86+
<_ 8787     function simpleQuery($query, $debug = false) {
  8888       global $messageStack, $osC_Services;
  8989