  |
5 | 5 | | osCommerce, Open Source E-Commerce Solutions |
| |
6 | 6 | | http://www.oscommerce.com |
| |
7 | 7 | | |
 |
8 | | - | Copyright (c) 2006 osCommerce |
| |
| 8 | + | Copyright (c) 2007 osCommerce |
|
9 | 9 | | |
| |
10 | 10 | | Released under the GNU General Public License |
| |
11 | 11 | | */ |
| |
|
|
 |
… |
|
138 | 138 | | } |
| |
139 | 139 | | |
| |
140 | 140 | | 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 | + | |
|
142 | 145 | | return $id; |
|
| 146 | + | } elseif ($id = @mysqli_insert_id($this->link)) { |
| |
| 147 | + | return $id; |
|
143 | 148 | | } else { |
| |
144 | 149 | | $this->setError(mysqli_error($this->link), mysqli_errno($this->link)); |
| |
145 | 150 | | |
| |
|
|
|
… |
|
156 | 161 | | } |
| |
157 | 162 | | |
| |
158 | 163 | | function startTransaction() { |
|
| 164 | + | $this->logging_transaction = true; |
| |
| 165 | + | |
|
159 | 166 | | if ($this->use_transactions === true) { |
| |
160 | 167 | | return @mysqli_autocommit($this->link, false); |
| |
161 | 168 | | } |
| |
|
|
|
… |
|
164 | 171 | | } |
| |
165 | 172 | | |
| |
166 | 173 | | function commitTransaction() { |
|
| 174 | + | if ($this->logging_transaction === true) { |
| |
| 175 | + | $this->logging_transaction = false; |
| |
| 176 | + | $this->logging_transaction_action = false; |
| |
| 177 | + | } |
| |
| 178 | + | |
|
167 | 179 | | if ($this->use_transactions === true) { |
| |
168 | 180 | | $result = @mysqli_commit($this->link); |
| |
169 | 181 | | |
| |
|
|
|
… |
|
176 | 188 | | } |
| |
177 | 189 | | |
| |
178 | 190 | | function rollbackTransaction() { |
|
| 191 | + | if ($this->logging_transaction === true) { |
| |
| 192 | + | $this->logging_transaction = false; |
| |
| 193 | + | $this->logging_transaction_action = false; |
| |
| 194 | + | } |
| |
| 195 | + | |
|
179 | 196 | | if ($this->use_transactions === true) { |
| |
180 | 197 | | $result = @mysqli_rollback($this->link); |
| |
181 | 198 | | |