Skip to content

Commit cad5973

Browse files
committed
Merge branch 'master' into 2.0-dev
2 parents c5167bc + 9f7d9fd commit cad5973

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: joomla
2+
custom: https://community.joomla.org/sponsorship-campaigns.html

src/IpHelper.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
/**
33
* Part of the Joomla Framework Utilities Package
44
*
5-
* @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
6-
* @license GNU General Public License version 2 or later; see LICENSE
5+
* @copyright Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
6+
* @license GNU General Public License version 2 or later; see LICENSE.txt
7+
* @note This file has been modified by the Joomla! Project and no longer reflects the original work of its author.
78
*/
89

910
namespace Joomla\Utilities;
1011

1112
/**
1213
* IpHelper is a utility class for processing IP addresses
1314
*
14-
* This class is adapted from the `FOFUtilsIp` class distributed with the Joomla! CMS as part of the FOF library by Akeeba Ltd.
15-
* The original class is copyright of Nicholas K. Dionysopoulos / Akeeba Ltd.
16-
*
1715
* @since 1.6.0
1816
*/
1917
final class IpHelper
@@ -31,6 +29,7 @@ final class IpHelper
3129
*
3230
* @var boolean
3331
* @since 1.6.0
32+
* @note The default value is false in version 2.0+
3433
*/
3534
private static $allowIpOverrides = false;
3635

@@ -448,7 +447,7 @@ protected static function detectAndCleanIP()
448447

449448
while (empty($ip) && !empty($ips))
450449
{
451-
$ip = array_pop($ips);
450+
$ip = array_shift($ips);
452451
$ip = trim($ip);
453452
}
454453
}

0 commit comments

Comments
 (0)