From 63472081a39f513b8cef7bdfffa74eee09f723e7 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 18 May 2007 16:44:31 +0000
Subject: [PATCH] check for safe mode before check for imagemagick

git-svn-id: file:///home/shish/svn/shimmie2/trunk@121 7f39781d-f577-437e-ae19-be835c7a54ca
---
 install.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/install.php b/install.php
index 39465166..34013583 100644
--- a/install.php
+++ b/install.php
@@ -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();