1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00

Issue #559, corrected the variables as suggested by quack23.

This commit is contained in:
dipsol 2009-11-05 14:06:58 +00:00
parent 70e99db5b6
commit 074c00c304

View file

@ -203,10 +203,10 @@ function check_config_values($conf) {
*/
function check_php_memory() {
$current = ini_get('memory_limit');
$current = substr($current_memory,0,strlen($current_memory)-1);
$current_memory = ini_get('memory_limit');
$current_memory = substr($current_memory,0,strlen($current_memory)-1);
if (intval($current) < 48) {
if (intval($current_memory) < 48) {
return false;
}
@ -239,9 +239,9 @@ function check_php_timelimit() {
function check_putenv() {
/* Check memory */
$current = ini_get('memory_limit');
$current = substr($current_memory,0,strlen($current_memory)-1);
$new_limit = ($current+16) . "M";
$current_memory = ini_get('memory_limit');
$current_memory = substr($current_memory,0,strlen($current_memory)-1);
$new_limit = ($current_memory+16) . "M";
/* Bump it by 16 megs (for getid3)*/
if (!ini_set(memory_limit,$new_limit)) {
@ -249,9 +249,9 @@ function check_putenv() {
}
// Make sure it actually worked
$current = ini_get('memory_limit');
$new_memory = ini_get('memory_limit');
if ($new_limit != $current) {
if ($new_limit != $new_memory) {
return false;
}