diff options
| -rw-r--r-- | phpBB/adm/index.php | 4 | ||||
| -rw-r--r-- | phpBB/docs/AUTHORS | 4 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_redis.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 1 | ||||
| -rw-r--r-- | tests/utf/normalizer_test.php | 6 |
5 files changed, 10 insertions, 17 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 68508bc353..bf4dc37044 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -402,7 +402,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) switch ($validator[$type]) { case 'string': - $length = strlen($cfg_array[$config_name]); + $length = utf8_strlen($cfg_array[$config_name]); // the column is a VARCHAR $validator[$max] = (isset($validator[$max])) ? min(255, $validator[$max]) : 255; @@ -600,7 +600,7 @@ function validate_range($value_ary, &$error) { case 'string' : $max = (isset($column[1])) ? min($column[1],$type['max']) : $type['max']; - if (strlen($value['value']) > $max) + if (utf8_strlen($value['value']) > $max) { $error[] = sprintf($user->lang['SETTING_TOO_LONG'], $user->lang[$value['lang']], $max); } diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 83feca009b..81bc9f52e6 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -23,13 +23,12 @@ involved in phpBB. phpBB Lead Developer: naderman (Nils Adermann) phpBB Developers: Acyd Burn (Meik Sievertsen) [Lead 09/2005 - 01/2010] - APTX (Marek A. R.) bantu (Andreas Fischer) ckwalsh (Cullen Walsh) igorw (Igor Wiedler) kellanved (Henry Sudhof) nickvergessen (Joas Schilling) - nn- (Oleg Pudeyev) + Oleg (Oleg Pudeyev) rxu (Ruslan Uzdenov) ToonArmy (Chris Smith) @@ -46,6 +45,7 @@ phpBB Project Manager: theFinn (James Atkinson) [Founder - 04/2007] phpBB Lead Developer: psoTFX (Paul S. Owen) [2001 - 09/2005] phpBB Developers: A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010] + APTX (Marek A. Ruszczyński) [12/2007 - 04/2011] Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006] BartVB (Bart van Bragt) [11/2000 - 03/2006] DavidMJ (David M.) [12/2005 - 08/2009] diff --git a/phpBB/includes/acm/acm_redis.php b/phpBB/includes/acm/acm_redis.php index 8954b9d0e7..41533eaacb 100644 --- a/phpBB/includes/acm/acm_redis.php +++ b/phpBB/includes/acm/acm_redis.php @@ -31,12 +31,6 @@ if (!defined('PHPBB_ACM_REDIS_HOST')) define('PHPBB_ACM_REDIS_HOST', 'localhost'); } -if (!defined('PHPBB_ACM_REDIS')) -{ - //can define multiple servers with host1/port1,host2/port2 format - define('PHPBB_ACM_REDIS', PHPBB_ACM_REDIS_HOST . '/' . PHPBB_ACM_REDIS_PORT); -} - /** * ACM for Redis * @@ -57,11 +51,7 @@ class acm extends acm_memory parent::acm_memory(); $this->redis = new Redis(); - foreach (explode(',', PHPBB_ACM_REDIS) as $server) - { - $parts = explode('/', $server); - $this->redis->connect(trim($parts[0]), trim($parts[1])); - } + $this->redis->connect(PHPBB_ACM_REDIS_HOST, PHPBB_ACM_REDIS_PORT); if (defined('PHPBB_ACM_REDIS_PASSWORD')) { diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 69369ff72d..7ef6e02a8d 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -592,6 +592,7 @@ class session // otherwise they'll index this page with the SID, duplicate content oh my! if ($bot && isset($_GET['sid'])) { + send_status_line(301, 'Moved Permanently'); redirect(build_url(array('sid'))); } diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php index 38b4ec1b6b..f78dba8004 100644 --- a/tests/utf/normalizer_test.php +++ b/tests/utf/normalizer_test.php @@ -298,12 +298,14 @@ class phpbb_utf_normalizer_test extends phpbb_test_case if (!$fpr = fopen($url, 'rb')) { - throw new RuntimeException("Failed to download $url"); + echo "Failed to download $url\n"; + return; } if (!$fpw = fopen($target, 'wb')) { - throw new RuntimeException("Failed to open $target for writing"); + echo "Failed to open $target for writing\n"; + return; } $chunk = 32768; |