aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-13 13:14:37 -0400
committerNils Adermann <naderman@naderman.de>2013-07-13 13:14:37 -0400
commit2aff3b19dfaebbbf561abbce9292aa1be53e8ef6 (patch)
tree653c5a9f23592b4ffd9f42908a6c25ae45142792 /phpBB/includes
parent9a486539c3abcf927aabd1fa48c141a0aee1014d (diff)
parentee3d4199bbb9d5e5374fe8e04ae9e9f4c6c0ec18 (diff)
downloadforums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.gz
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.bz2
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.tar.xz
forums-2aff3b19dfaebbbf561abbce9292aa1be53e8ef6.zip
Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release-3.0.12
* github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php2
-rw-r--r--phpBB/includes/acp/acp_send_statistics.php2
-rw-r--r--phpBB/includes/db/dbal.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index ee7bd4dc45..d80b0d1532 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -402,7 +402,7 @@ class acp_main
{
$template->assign_vars(array(
'S_PHP_VERSION_OLD' => true,
- 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], '<a href="http://www.phpbb.com/community/viewtopic.php?f=14&amp;t=2152375">', '</a>'),
+ 'L_PHP_VERSION_OLD' => sprintf($user->lang['PHP_VERSION_OLD'], '<a href="https://www.phpbb.com/community/viewtopic.php?f=14&amp;t=2152375">', '</a>'),
));
}
diff --git a/phpBB/includes/acp/acp_send_statistics.php b/phpBB/includes/acp/acp_send_statistics.php
index b3baf54983..b8fc2d2c45 100644
--- a/phpBB/includes/acp/acp_send_statistics.php
+++ b/phpBB/includes/acp/acp_send_statistics.php
@@ -29,7 +29,7 @@ class acp_send_statistics
{
global $config, $template, $phpbb_admin_path, $phpEx;
- $collect_url = "http://www.phpbb.com/stats/receive_stats.php";
+ $collect_url = "https://www.phpbb.com/stats/receive_stats.php";
$this->tpl_name = 'acp_send_statistics';
$this->page_title = 'ACP_SEND_STATISTICS';
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index 9cc337955b..30d2870938 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -827,7 +827,7 @@ class dbal
</div>
</div>
<div id="page-footer">
- Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
+ Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group
</div>
</div>
</body>