Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 33 deletions

diff --git a/system/core/utf8/str_split.php b/system/core/utf8/str_split.php
deleted file mode 100644
index bc382cb6..00000000
--- a/system/core/utf8/str_split.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * utf8::str_split
- *
- * @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 _str_split($str, $split_length = 1)
-{
-	$split_length = (int) $split_length;
-
-	if (utf8::is_ascii($str))
-	{
-		return str_split($str, $split_length);
-	}
-
-	if ($split_length < 1)
-	{
-		return FALSE;
-	}
-
-	if (utf8::strlen($str) <= $split_length)
-	{
-		return array($str);
-	}
-
-	preg_match_all('/.{'.$split_length.'}|[^\x00]{1,'.$split_length.'}$/us', $str, $matches);
-
-	return $matches[0];
-}
\ No newline at end of file