aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-06-28 23:12:40 +0000
committerplegall <plg@piwigo.org>2010-06-28 23:12:40 +0000
commit4b4d79c2392ac17ff208b50bb8b051e1ca18137f (patch)
tree29746d0be614f84b334b82c962a28f7f6ff9e723 /admin
parentc6d981cc58f337a7f2c6a303f5748253034cc59d (diff)
merge r6618 from branch 2.1 to trunk
bug 1746 fixed: a missing GD library is a setup error, it blocks the upload form. git-svn-id: http://piwigo.org/svn/trunk@6620 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/photos_add_direct.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php
index 682e4baaa..7d094755d 100644
--- a/admin/photos_add_direct.php
+++ b/admin/photos_add_direct.php
@@ -450,6 +450,11 @@ if (!empty($error_message))
array_push($setup_errors, $error_message);
}
+if (!function_exists('gd_info'))
+{
+ array_push($setup_errors, l10n('GD library is missing'));
+}
+
$template->assign(
array(
'setup_errors'=> $setup_errors,