← Back to branch summary

~ubuntu-branches/ubuntu/hardy/phpmyadmin/hardy

« back to all changes in this revision

Viewing changes to libraries/dbi/mysqli.dbi.lib.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst, Thijs Kinkhorst, Translations
  • Date: 2007-06-17 17:52:03 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20070617175203-6oa2mpmgazkhp8tl
Tags: 4:2.10.2-1
http://bugs.debian.org/427177

[ Thijs Kinkhorst ]
* New upstream release.
* Welcome Michal Čihař as new co-maintainer.

[ Translations ]
* Vietnamese by Clytie Siddall (Closes: #427177).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/dbi/mysqli.dbi.lib.php
1
1
<?php
2
 
/* $Id: mysqli.dbi.lib.php 9662 2006-11-02 13:34:14Z nijel $ */
 
2
/* $Id: mysqli.dbi.lib.php 10356 2007-05-08 20:39:33Z cybot_tm $ */
3
3
// vim: expandtab sw=4 ts=4 sts=4:
4
4
 
5
5
/**
178
178
    if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 40100) {
179
179
        $query = PMA_convert_charset($query);
180
180
    }
181
 
    $result = mysqli_query($link, $query, $method);
182
 
 
183
 
    if (mysqli_warning_count($link)) {
184
 
        /**
185
 
         * @todo check $method ?
186
 
         */
187
 
        $warning_result = mysqli_query($link, 'SHOW WARNINGS');
188
 
        if ($warning_result) {
189
 
            $warning_row = mysqli_fetch_row($warning_result);
190
 
            $GLOBALS['warning'] = sprintf("%s (%d): %s", $warning_row[0], $warning_row[1], $warning_row[2]);
191
 
        }
192
 
    } else {
193
 
        unset($GLOBALS['warning']);
194
 
    }
195
 
 
196
 
    return $result;
 
181
    return mysqli_query($link, $query, $method);
197
182
 
198
183
    // From the PHP manual:
199
184
    // "note: returns true on success or false on failure. For SELECT,