aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_userauth.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-07-19 11:39:37 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-07-19 11:39:37 +0000
commit4041ad47d2f2e495a7ca447629b718f281190984 (patch)
tree7a913e5cc19329a27bd5561d2ec1edecdc2196a2 /phpBB/admin/admin_userauth.php
parent0da3c2d0dff9e10d87d55bc8a2d908fb4cd0ab59 (diff)
downloadforums-4041ad47d2f2e495a7ca447629b718f281190984.tar
forums-4041ad47d2f2e495a7ca447629b718f281190984.tar.gz
forums-4041ad47d2f2e495a7ca447629b718f281190984.tar.bz2
forums-4041ad47d2f2e495a7ca447629b718f281190984.tar.xz
forums-4041ad47d2f2e495a7ca447629b718f281190984.zip
Im so sick and tired of introducing new bugs each time I commit :(
git-svn-id: file:///svn/phpbb/trunk@699 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin/admin_userauth.php')
0 files changed, 0 insertions, 0 deletions
>space:mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-17 17:02:52 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-17 17:02:52 +0000
commit5d94b3cab143d33003686395c6c15b0ae662767a (patch)
treebe786c7efa85fd47775d8da4cf8068b6e5975edf /perl-install/install_steps_interactive.pm
parentb6de65c3ac8f7391220509a84854777dbe66b1a1 (diff)
downloaddrakx-5d94b3cab143d33003686395c6c15b0ae662767a.tar
drakx-5d94b3cab143d33003686395c6c15b0ae662767a.tar.gz
drakx-5d94b3cab143d33003686395c6c15b0ae662767a.tar.bz2
drakx-5d94b3cab143d33003686395c6c15b0ae662767a.tar.xz
drakx-5d94b3cab143d33003686395c6c15b0ae662767a.zip
bring back generic release-notes.txt to life
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 70c21d629..58f176d09 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -74,7 +74,8 @@ sub acceptLicense {
my ($o) = @_;
$o->{release_notes} = do {
- my $af = install_any::getFile("release-notes.". arch().".txt");
+ my $f = install_any::getFile('release-notes.txt');
+ my $af = install_any::getFile("release-notes." . arch() . ".txt");
join('', <$f>, $af ? ("\n\n", <$af>) : ());
};