Merge over vendor code.

git-svn-id: http://gallery.svn.sourceforge.net/svnroot/gallery/trunk/eval/gx/gallery3/trunk@18408 57fcd75e-5312-0410-8df3-f5eb6fbb1595

1 files changed, 22 insertions, 0 deletions

diff --git a/kohana/core/utf8/rtrim.php b/kohana/core/utf8/rtrim.php
new file mode 100644
index 00000000..c7571eb2
--- /dev/null
+++ b/kohana/core/utf8/rtrim.php
@@ -0,0 +1,22 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * 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