aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-08-17 04:27:38 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-08-17 04:27:38 +0000
commit6294974d863fc7220b55b8fc7ab72a2bb399157c (patch)
treee932029230a4a6738302bfa405041c69aff8a333 /phpBB/includes/acp
parentcfc23dd56220025d6cfcff6d393b97843ad44d02 (diff)
downloadforums-6294974d863fc7220b55b8fc7ab72a2bb399157c.tar
forums-6294974d863fc7220b55b8fc7ab72a2bb399157c.tar.gz
forums-6294974d863fc7220b55b8fc7ab72a2bb399157c.tar.bz2
forums-6294974d863fc7220b55b8fc7ab72a2bb399157c.tar.xz
forums-6294974d863fc7220b55b8fc7ab72a2bb399157c.zip
forgot to remove some debug code :P
git-svn-id: file:///svn/phpbb/trunk@6297 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_database.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index da6d375292..4a5382b67a 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -120,9 +120,9 @@ class acp_database
if ($download == true)
{
$name = $filename . $ext;
- //header('Pragma: no-cache');
- //header("Content-Type: $mimetype; name=\"$name\"");
- //header("Content-disposition: attachment; filename=$name");
+ header('Pragma: no-cache');
+ header("Content-Type: $mimetype; name=\"$name\"");
+ header("Content-disposition: attachment; filename=$name");
}
// All of the generated queries go here
@@ -1234,9 +1234,9 @@ class acp_database
break;
}
- //header('Pragma: no-cache');
- //header("Content-Type: $mimetype; name=\"$name\"");
- //header("Content-disposition: attachment; filename=$name");
+ header('Pragma: no-cache');
+ header("Content-Type: $mimetype; name=\"$name\"");
+ header("Content-disposition: attachment; filename=$name");
echo $data;
die;
}
121a2c20fbf2ac39f64ab459c7e190978aafd7.tar.bz2'>drakx-68121a2c20fbf2ac39f64ab459c7e190978aafd7.tar.bz2
drakx-68121a2c20fbf2ac39f64ab459c7e190978aafd7.tar.xz
drakx-68121a2c20fbf2ac39f64ab459c7e190978aafd7.zip
enable to pass untranslated defaut to yes/no or ok/cancel like
questions by translating value at runtime
Diffstat (limited to 'perl-install/wizards.pm')
-rw-r--r--perl-install/wizards.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/wizards.pm b/perl-install/wizards.pm
index 86ebd95a5..18083c4d7 100644
--- a/perl-install/wizards.pm
+++ b/perl-install/wizards.pm
@@ -155,7 +155,8 @@ sub process {
my $name = ref($page->{name}) ? $page->{name}->() : $page->{name};
my %yesno = (yes => N("Yes"), no => N("No"));
my $yes = $page->{default};
- $data2 = [ { val => \$yes, type => 'list', list => [ values %yesno ], gtk => { use_boxradio => 1 } } ] if $page->{type} eq "yesorno";
+ $data2 = [ { val => \$yes, type => 'list', list => [ keys %yesno ], format => sub { $yesno{$_[0]} },
+ gtk => { use_boxradio => 1 } } ] if $page->{type} eq "yesorno";
my $a;
if (ref $data2 eq 'ARRAY' && @$data2) {
$a = $in->ask_from_({ title => $o->{name},
@@ -172,7 +173,7 @@ sub process {
# step forward:
push @steps, $next if !$page->{ignore} && $steps[-1] ne $next;
my $current = $next;
- $next = defined $page->{post} ? $page->{post}($page->{type} eq "yesorno" ? $yes eq $yesno{yes} : $a) : 0;
+ $next = defined $page->{post} ? $page->{post}($page->{type} eq "yesorno" ? $yes eq 'yes' : $a) : 0;
return if $page->{end};
if (!$next) {
if (!defined $o->{pages}{$next}) {