tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-03-06 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_io.php, include/db/mysql.php: fixed warnings
	messages from PHP.
	
	Fixes: #3607014




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7799 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-03-06 17:28:55 +00:00
parent f750c167ae
commit d36e33d9a5
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-03-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_io.php, include/db/mysql.php: fixed warnings
messages from PHP.
Fixes: #3607014
2013-03-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the lost ip in the

14
pandora_console/include/db/mysql.php
View File

@ -712,7 +712,12 @@ function mysql_db_get_all_rows_filter ($table, $filter = array(), $fields = fals
function mysql_db_get_num_rows ($sql) {
$result = mysql_query($sql);
return mysql_num_rows($result);
if ($result) {
return mysql_num_rows($result);
}
else {
return 0;
}
}
/**
@ -926,7 +931,12 @@ function mysql_db_get_all_row_by_steps_sql($new = true, &$result, $sql = null) {
if ($new == true)
$result = mysql_query($sql);
return mysql_fetch_assoc($result);
if ($result) {
return mysql_fetch_assoc($result);
}
else {
return array();
}
}
/**

2
pandora_console/include/functions_io.php
View File

@ -382,7 +382,7 @@ function __ ($string /*, variable arguments */) {
return $tranlateString;
}
}
elseif ($config['enterprise_installed'] &&
elseif (enterprise_installed() &&
isset($config['translate_string_extension_installed']) &&
$config['translate_string_extension_installed'] == 1 &&
array_key_exists('translate_string.php', $extensions)) {