aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-02-17 09:18:31 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:01 +0200
commit6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1 (patch)
tree37d01016d8fb6f3d65be089dcc69bca34af49417 /tests
parent42c1297345cf7b025a82a7c1de7b7f6714de7cb8 (diff)
downloadforums-6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1.tar
forums-6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1.tar.gz
forums-6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1.tar.bz2
forums-6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1.tar.xz
forums-6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1.zip
[ticket/11768] Added limited support for [url] in [quote] author
PHPBB3-11768
Diffstat (limited to 'tests')
-rw-r--r--tests/text_formatter/s9e/default_formatting_test.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php
index 99a89a8d2e..b28c8b157e 100644
--- a/tests/text_formatter/s9e/default_formatting_test.php
+++ b/tests/text_formatter/s9e/default_formatting_test.php
@@ -201,6 +201,18 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
'... www.example.org ...',
'... <a href="http://www.example.org" class="postlink">www.example.org</a> ...'
),
+ array(
+ '[quote="[url=http://example.org]xxx[/url]"]...[/quote]',
+ '<blockquote><div><cite><a href="http://example.org" class="postlink">xxx</a> wrote:</cite>...</div></blockquote>'
+ ),
+ array(
+ '[quote="[url]http://example.org[/url]"]...[/quote]',
+ '<blockquote><div><cite><a href="http://example.org" class="postlink">http://example.org</a> wrote:</cite>...</div></blockquote>'
+ ),
+ array(
+ '[quote="http://example.org"]...[/quote]',
+ '<blockquote><div><cite><a href="http://example.org" class="postlink">http://example.org</a> wrote:</cite>...</div></blockquote>'
+ ),
);
}
}
ll_any.pm?h=17.85&id=b60c0cb8f67d745626fec6f0c8540818f24e91a6&id2=0a96d505550060312a1cd9a04a9ae9bf23ebdaa2'>diff)downloaddrakx-b60c0cb8f67d745626fec6f0c8540818f24e91a6.tar
drakx-b60c0cb8f67d745626fec6f0c8540818f24e91a6.tar.gz
drakx-b60c0cb8f67d745626fec6f0c8540818f24e91a6.tar.bz2
drakx-b60c0cb8f67d745626fec6f0c8540818f24e91a6.tar.xz
drakx-b60c0cb8f67d745626fec6f0c8540818f24e91a6.zip
move to MDK::Common, bool->to_bool
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 979216b8f..9ea9ee746 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -14,7 +14,8 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @needToCopy @needToCopyIfRequiresSatisf
#-######################################################################################
#- misc imports
#-######################################################################################
-use common qw(:common :system :functional :file);
+use MDK::Common::System;
+use common;
use run_program;
use partition_table qw(:types);
use partition_table_raw;
@@ -283,7 +284,7 @@ sub getAvailableSpace {
sub getAvailableSpace_mounted {
my ($prefix) = @_;
my $dir = -d "$prefix/usr" ? "$prefix/usr" : "$prefix";
- my (undef, $free) = common::df($dir) or return;
+ my (undef, $free) = MDK::Common::System::df($dir) or return;
log::l("getAvailableSpace_mounted $free KB");
$free * 1024 || 1;
}
@@ -865,7 +866,7 @@ sub getHds {
sub log_sizes {
my ($o) = @_;
- my @df = common::df($o->{prefix});
+ my @df = MDK::Common::System::df($o->{prefix});
log::l(sprintf "Installed: %s(df), %s(rpm)",
formatXiB($df[0] - $df[1], 1024),
formatXiB(sum(`$ENV{LD_LOADER} rpm --root $o->{prefix}/ -qa --queryformat "%{size}\n"`))) if -x "$o->{prefix}/bin/rpm";