check for safe mode before check for imagemagick

git-svn-id: file:///home/shish/svn/shimmie2/trunk@121 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-05-18 16:44:31 +00:00
parent bf46c2fd54
commit 63472081a3

View file

@ -249,9 +249,11 @@ function insert_defaults($dsn, $admin_name, $admin_pass) { // {{{
$admin_pass = md5(strtolower($admin_name).$admin_pass);
$db->Execute($user_insert, Array($admin_name, $admin_pass, 'Y'));
$convert_check = exec("convert");
if(!empty($convert_check)) {
$db->Execute($config_insert, Array('thumb_engine', 'convert'));
if(!ini_get('safe_mode')) {
$convert_check = exec("convert");
if(!empty($convert_check)) {
$db->Execute($config_insert, Array('thumb_engine', 'convert'));
}
}
$db->Close();