Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

1123
 
1290
 
1290
 
mysqli.php
_> 55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
  77 
<> 8 -  Copyright (c) 2006 osCommerce
   8+  Copyright (c) 2007 osCommerce
99 
  1010   Released under the GNU General Public License
  1111 */
     
 !
138138     }
  139139 
  140140     function nextID() {
<> 141 -      if ($id = @mysqli_insert_id($this->link)) {
   141+      if ( is_numeric($this->nextID) ) {
   142+        $id = $this->nextID;
   143+        $this->nextID = null;
   144+
142145         return $id;
<>  146+      } elseif ($id = @mysqli_insert_id($this->link)) {
   147+        return $id;
143148       } else {
  144149         $this->setError(mysqli_error($this->link), mysqli_errno($this->link));
  145150 
     
 !
155160       return @mysqli_affected_rows($this->link);
  156161     }
  157162 
<> 158 -    function startTransaction() {
   163+    function startTransaction($logging = false) {
   164+      if ($logging === true) {
   165+        $this->logging_transaction = true;
   166+      }
   167+
159168       if ($this->use_transactions === true) {
  160169         return @mysqli_autocommit($this->link, false);
  161170       }
     
 !
164173     }
  165174 
  166175     function commitTransaction() {
<>  176+      if ($this->logging_transaction === true) {
   177+        $this->logging_transaction = false;
   178+        $this->logging_transaction_action = false;
   179+      }
   180+
167181       if ($this->use_transactions === true) {
  168182         $result = @mysqli_commit($this->link);
  169183 
     
 !
176190     }
  177191 
  178192     function rollbackTransaction() {
<>  193+      if ($this->logging_transaction === true) {
   194+        $this->logging_transaction = false;
   195+        $this->logging_transaction_action = false;
   196+      }
   197+
<_ 179198       if ($this->use_transactions === true) {
  180199         $result = @mysqli_rollback($this->link);
  181200