diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
| commit | 54f94e0d428c5963ecca86a40247105e51288432 (patch) | |
| tree | 275c5ec85c31595d0341d6ad630565b7a6a4cdcc /phpBB/includes/utf | |
| parent | 1a09d0e238666a386a76878d6395986947b11c1e (diff) | |
| parent | b5535db081dca0187caae84cf7ffd8d6045dccba (diff) | |
| download | forums-54f94e0d428c5963ecca86a40247105e51288432.tar forums-54f94e0d428c5963ecca86a40247105e51288432.tar.gz forums-54f94e0d428c5963ecca86a40247105e51288432.tar.bz2 forums-54f94e0d428c5963ecca86a40247105e51288432.tar.xz forums-54f94e0d428c5963ecca86a40247105e51288432.zip | |
Merge commit 'release-3.0-RC6'
Diffstat (limited to 'phpBB/includes/utf')
| -rw-r--r-- | phpBB/includes/utf/utf_normalizer.php | 15 | ||||
| -rw-r--r-- | phpBB/includes/utf/utf_tools.php | 12 |
2 files changed, 17 insertions, 10 deletions
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index 4c705b05cb..a77952499a 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -1,14 +1,21 @@ <?php -/** +/** * * @package utf -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +/** * Some Unicode characters encoded in UTF-8 * * Preserved for compatibility diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index a3499062fe..77971f7e68 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -240,7 +240,7 @@ else /** * UTF-8 aware alternative to strrpos * Find position of last occurrence of a char in a string - * + * * @author Harry Fuecks * @param string $str haystack * @param string $needle needle @@ -329,7 +329,7 @@ else * such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does * not exist in the Chinese alphabet, for example. See Unicode Standard * Annex #21: Case Mappings - * + * * @param string * @return string string in lowercase */ @@ -394,7 +394,7 @@ else * such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does * not exist in the Chinese alphabet, for example. See Unicode Standard * Annex #21: Case Mappings - * + * * @param string * @return string string in uppercase */ @@ -614,7 +614,7 @@ else /** * UTF-8 aware alternative to str_split * Convert a string to an array -* +* * @author Harry Fuecks * @param string $str UTF-8 encoded * @param int $split_len number to characters to split string by @@ -640,7 +640,7 @@ function utf8_str_split($str, $split_len = 1) /** * UTF-8 aware alternative to strspn * Find length of initial segment matching the mask -* +* * @author Harry Fuecks */ function utf8_strspn($str, $mask, $start = null, $length = null) @@ -663,7 +663,7 @@ function utf8_strspn($str, $mask, $start = null, $length = null) /** * UTF-8 aware alternative to ucfirst * Make a string's first character uppercase -* +* * @author Harry Fuecks * @param string * @return string with first character as upper case (if applicable) |