X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=php5-cn.git;a=blobdiff_plain;f=debian%2Fconfig;fp=debian%2Fconfig;h=c8eb01095dcbcc4855b24d7505278f355ce8ff02;hp=51ba28c54c1bcb55eb58fd9d0a91ff3e4a9d0919;hb=5f60735077e132585dcbf34616bb27d3e520d915;hpb=860b087a7890a77c96a1f8dd08177f111c565739

diff --git a/debian/config b/debian/config
index 51ba28c..c8eb010 100755
--- a/debian/config
+++ b/debian/config
@@ -49,20 +49,23 @@ for SAPI in apache2 cli; do
     upload_max_filesize=
     post_max_size=
     memory_limit=
+    error_reporting=
 
     phplimit="$(phpmemlimit)M"
 
     if [ -f "$ini_file" ]; then
 
-        if egrep -q "^[[:space:]]*(upload_max_filesize|post_max_size|memory_limit)[[:space:]]*=" $ini_file; then
+        if egrep -q "^[[:space:]]*(upload_max_filesize|post_max_size|memory_limit|error_reporting)[[:space:]]*=" $ini_file; then
 
             upload_max_filesize=`awk '$1 == "upload_max_filesize" { print $3; exit(0) }' $ini_file`
             post_max_size=`awk '$1 == "post_max_size" { print $3; exit(0) }' $ini_file`
             memory_limit=`awk '$1 == "memory_limit" { print $3; exit(0) }' $ini_file`
+            error_reporting=`awk '$1 == "error_reporting" { print $3; exit(0) }' $ini_file`
 
             if [ "$upload_max_filesize" != "256M" ]; then ini_diff=1; fi
             if [ "$post_max_size" != "$phplimit" ]; then ini_diff=1; fi
             if [ "$memory_limit" != "$phplimit" ]; then ini_diff=1; fi
+            if [ "$error_reporting" != "E_ERROR" ]; then ini_diff=1; fi
         else
 
             ini_diff=1
@@ -78,6 +81,7 @@ for SAPI in apache2 cli; do
         test -z "$upload_max_filesize" && upload_max_filesize="2M"
         test -z "$post_max_size" && post_max_size="8M"
         test -z "$memory_limit" && memory_limit="16M"
+        test -z "$error_reporting" && error_reporting="E_ALL & ~E_DEPRECATED"
 
         db_title php5-cn - konfiguracija za $(echo ${SAPI} | sed 's/a/A/;s/cli/CLI/')
         db_subst php5-cn/${SAPI} ini_file "$ini_file"
@@ -88,6 +92,9 @@ for SAPI in apache2 cli; do
 
         db_subst php5-cn/${SAPI} new_phplimit "$phplimit"
 
+        db_subst php5-cn/${SAPI} error_reporting "$error_reporting"
+        db_subst php5-cn/${SAPI} new_error_reporting "E_ERROR"
+
         db_input critical php5-cn/${SAPI} || true
         db_go || true
     else