aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2012-06-14 19:23:46 +0100
committerBruno Ais <brunoaiss@gmail.com>2012-06-14 19:23:46 +0100
commit27775e89a50021cab7938079d2da431c3bd75a47 (patch)
tree496d09c9100964d8163100dd5640a10eab6e8cb0
parent6069d9a3d7479f1fe0e7e7072aee0f3ea394519b (diff)
downloadforums-27775e89a50021cab7938079d2da431c3bd75a47.tar
forums-27775e89a50021cab7938079d2da431c3bd75a47.tar.gz
forums-27775e89a50021cab7938079d2da431c3bd75a47.tar.bz2
forums-27775e89a50021cab7938079d2da431c3bd75a47.tar.xz
forums-27775e89a50021cab7938079d2da431c3bd75a47.zip
[ticket/10845] Removed one empty line that wasn't supposed to be there
I onder when it got there... Maybe a wrong rebase... Don't really know. PHPBB3-10845
-rw-r--r--phpBB/report.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/report.php b/phpBB/report.php
index 4149a00329..d792b8df6a 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -154,7 +154,6 @@ if ($submit && $reason_id)
trigger_error('EMPTY_REPORT');
}
-
$sql_ary = array(
'reason_id' => (int) $reason_id,
'post_id' => $post_id,
lect>space:mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-31 23:10:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-31 23:10:55 +0000
commit79d226c48d6de4f26c604ddbd0ce769a58d548c6 (patch)
treead304fe307e7f11c32dc871ce003ebcd98fa7878 /perl-install/standalone/diskdrake
parent4033bc27a2a0d49d9de8d55b7bd9424f2148c89c (diff)
downloaddrakx-79d226c48d6de4f26c604ddbd0ce769a58d548c6.tar
drakx-79d226c48d6de4f26c604ddbd0ce769a58d548c6.tar.gz
drakx-79d226c48d6de4f26c604ddbd0ce769a58d548c6.tar.bz2
drakx-79d226c48d6de4f26c604ddbd0ce769a58d548c6.tar.xz
drakx-79d226c48d6de4f26c604ddbd0ce769a58d548c6.zip
Handle parsing --embedded command line in standalone.pm
=> allows to remove the somewhat mythical $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/
Diffstat (limited to 'perl-install/standalone/diskdrake')
-rwxr-xr-xperl-install/standalone/diskdrake5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 97fca7bde..56f175b57 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -40,10 +40,7 @@ my %options;
my @l = @ARGV;
while (my $e = shift @l) {
my ($option) = $e =~ /--?(.*)/ or next;
- if ($option eq 'embedded') {
- $::isEmbedded = 1;
- ($::XID, $::CCPID, @l) = @l;
- } elsif ($option =~ /(.*?)=(.*)/) {
+ if ($option =~ /(.*?)=(.*)/) {
$options{$1} = $2;
} else {
$options{$option} = '';