@@ -27,7 +27,6 @@ use strict;
27
27
use warnings;
28
28
use File::Spec;
29
29
use File::Temp;
30
- use iMSCP::Boolean;
31
30
use iMSCP::Crypt qw/ decryptRijndaelCBC encryptRijndaelCBC randomStr / ;
32
31
use iMSCP::Cwd ' $CWD' ;
33
32
use iMSCP::Database;
@@ -148,8 +147,6 @@ sub uninstall
148
147
149
148
local $@ ;
150
149
eval {
151
- local $self -> {' dbh' }-> {' RaiseError' } = TRUE;
152
-
153
150
$self -> {' dbh' }-> do(
154
151
" DROP DATABASE IF EXISTS `@{ [ $: :imscpConfig{'DATABASE_NAME'} . '_pma' ] }`"
155
152
);
@@ -201,19 +198,19 @@ sub afterFrontEndBuildConfFile
201
198
{
202
199
my ( $tplContent , $tplName ) = @_ ;
203
200
204
- return 0 unless grep (
205
- $_ eq $tplName , ' 00_master.nginx' , ' 00_master_ssl.nginx'
206
- );
201
+ return 0 unless grep ( $_ eq $tplName , qw/
202
+ 00_master.nginx 00_master_ssl.nginx
203
+ / );
207
204
208
205
${ $tplContent } = replaceBloc(
209
206
" # SECTION custom BEGIN.\n " ,
210
207
" # SECTION custom END.\n " ,
211
208
" # SECTION custom BEGIN.\n "
212
209
. getBloc(
213
- " # SECTION custom BEGIN.\n " ,
214
- " # SECTION custom END.\n " ,
215
- ${ $tplContent }
216
- )
210
+ " # SECTION custom BEGIN.\n " ,
211
+ " # SECTION custom END.\n " ,
212
+ ${ $tplContent }
213
+ )
217
214
. " include imscp_pma.conf;\n "
218
215
. " # SECTION custom END.\n " ,
219
216
${ $tplContent }
@@ -260,8 +257,6 @@ sub _buildConfigFiles
260
257
local $@ ;
261
258
my $rs = eval {
262
259
# Main configuration file
263
- local $self -> {' dbh' }-> {' RaiseError' } = TRUE;
264
-
265
260
my %config = @{ $self -> {' dbh' }-> selectcol_arrayref(
266
261
" SELECT `name`, `value` FROM `config` WHERE `name` LIKE 'PMA_%'" ,
267
262
{ Columns => [ 1, 2 ] }
@@ -408,10 +403,7 @@ sub _setupDatabase
408
403
my $database = ::setupGetQuestion( ' DATABASE_NAME' ) . ' _pma' ;
409
404
410
405
local $@ ;
411
- eval {
412
- local $self -> {' dbh' }-> {' RaiseError' } = TRUE;
413
- $self -> {' dbh' }-> do( " DROP DATABASE IF EXISTS `$database `" );
414
- };
406
+ eval { $self -> {' dbh' }-> do( " DROP DATABASE IF EXISTS `$database `" ); };
415
407
if ( $@ ) {
416
408
error( $@ );
417
409
return 1;
@@ -471,8 +463,6 @@ sub _setupSqlUser
471
463
$self -> {' _pma_control_user_passwd' }
472
464
);
473
465
474
- local $self -> {' dbh' }-> {' RaiseError' } = TRUE;
475
-
476
466
$self -> {' dbh' }-> do(
477
467
' GRANT USAGE ON `mysql`.* TO ?@?' ,
478
468
undef ,
0 commit comments