Fix some warnings.

This commit is contained in:
Michal Čihař
2004-12-30 15:53:51 +00:00
parent d569a94052
commit 62dd3ea75a
2 changed files with 19 additions and 14 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-12-30 Michal Čihař <michal@cihar.com>
* libraries/fpdf/ufpdf.php: Fix some warnings.
2004-12-29 Michal Čihař <michal@cihar.com>
* libraries/export/sql.php: Fix typo.
* server_databases.php: Use same sort order as in left frame (bug

View File

@@ -15,7 +15,7 @@ if(!class_exists('UFPDF'))
{
define('UFPDF_VERSION','0.1');
include_once 'fpdf.php';
include_once './libraries/fpdf/fpdf.php';
class UFPDF extends FPDF
{
@@ -318,7 +318,8 @@ function utf8_to_utf16be(&$txt, $bom = true) {
$q = array($c);
// Fetch rest of sequence
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
$l = strlen($txt);
while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
// Check length
if (count($q) != $s) {
@@ -419,7 +420,8 @@ function utf8_to_codepoints(&$txt) {
$q = array($c);
// Fetch rest of sequence
while (ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
$l = strlen($txt);
while ($i + 1 < $l && ord($txt{$i + 1}) >= 0x80 && ord($txt{$i + 1}) < 0xC0) { ++$i; $q[] = ord($txt{$i}); }
// Check length
if (count($q) != $s) {