Fixed a warning and a bug with php 3.0.12 thanks to Kris Wood

This commit is contained in:
Loïc Chapeaux
2002-05-01 09:27:07 +00:00
parent 95daed4ec9
commit 5e7ae5779e
3 changed files with 9 additions and 5 deletions

View File

@@ -10,6 +10,10 @@ $Source$
* tbl_properties_options.php3: added labels and beautified display.
* db_stats.php3, lines 12-22: ensure this script can only be ran by a
super-user.
* libraries/grab_globals.lib.php3: fixed a bug with the "extact()" function
under php 3.0.12 thanks to Kris Wood <kris at navi.net>.
* libraries/common.lib.php3, line 791: fixed a warning thanks to
Kris Wood <kris at navi.net>.
2002-04-30 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lang/italian.inc.php3: updated thanks to Pietro Danesi.

View File

@@ -788,7 +788,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
function PMA_countRecords($db, $table, $ret = FALSE)
{
$result = mysql_query('SELECT COUNT(*) AS num FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table));
$num = mysql_result($result, 0, 'num');
$num = ($result) ? mysql_result($result, 0, 'num') : 0;
mysql_free_result($result);
if ($ret) {
return $num;

View File

@@ -13,15 +13,15 @@ if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
define('PMA_GRAB_GLOBALS_INCLUDED', 1);
if (!empty($_GET)) {
extract($_GET);
extract($_GET, EXTR_OVERWRITE);
} else if (!empty($HTTP_GET_VARS)) {
extract($HTTP_GET_VARS);
extract($HTTP_GET_VARS, EXTR_OVERWRITE);
} // end if
if (!empty($_POST)) {
extract($_POST);
extract($_POST, EXTR_OVERWRITE);
} else if (!empty($HTTP_POST_VARS)) {
extract($HTTP_POST_VARS);
extract($HTTP_POST_VARS, EXTR_OVERWRITE);
} // end if
if (!empty($_FILES)) {