Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 18ac9009

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Fix merge issue that removed all staff from developer branch :-).

Zobrazit rozdíly:

application/controllers/setup_config.php
}
else
{
$upload_filesize = file::shortened_size_to_bytes(ini_get('upload_max_filesize'));
$post_size = file::shortened_size_to_bytes(ini_get('post_max_size'));
if ($upload_filesize > $post_size)
{
$upload_filesize = $post_size;
}
foreach ($htaccessFile as $line_num => $line)
{
// find line with RewriteBase
......
$htaccessFile[$line_num]
);
}
else if (preg_match("/^php_value upload_max_filesize (.+)/", $line))
{
$htaccessFile[$line_num] = preg_replace(
"/^(php_value upload_max_filesize )(.+)/",
'${1}'.$upload_filesize, $line
);
}
else if (preg_match("/^php_value post_max_size (.+)/", $line))
{
$htaccessFile[$line_num] = preg_replace(
"/^(php_value post_max_size )(.+)/",
'${1}'.$upload_filesize, $line
);
}
}
// root directory is writable, create .htacess
$handle = @fopen('.htaccess', 'w');
......
}
$value = $input->value;
if (!empty($value) && !preg_match('/^[a-z0-9_-]+$/i', $value))
{
$input->add_error('required', __(

Také k dispozici: Unified diff