diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-26 11:24:50 -0800 |
| commit | 3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch) | |
| tree | 442fd290505817efc0324f2af6e01805cb7396aa /system/core/utf8/rtrim.php | |
| parent | 1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff) | |
| parent | 32d25dafd5b033338b6a9bb8c7c53edab462543a (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/albums.php
modules/gallery/controllers/movies.php
modules/gallery/controllers/photos.php
Diffstat (limited to 'system/core/utf8/rtrim.php')
| -rw-r--r-- | system/core/utf8/rtrim.php | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/system/core/utf8/rtrim.php b/system/core/utf8/rtrim.php deleted file mode 100644 index efa0e19d..00000000 --- a/system/core/utf8/rtrim.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php defined('SYSPATH') OR die('No direct access allowed.'); -/** - * utf8::rtrim - * - * @package Core - * @author Kohana Team - * @copyright (c) 2007 Kohana Team - * @copyright (c) 2005 Harry Fuecks - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt - */ -function _rtrim($str, $charlist = NULL) -{ - if ($charlist === NULL) - return rtrim($str); - - if (utf8::is_ascii($charlist)) - return rtrim($str, $charlist); - - $charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist); - - return preg_replace('/['.$charlist.']++$/uD', '', $str); -}
\ No newline at end of file |