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, 30 deletions

diff --git a/system/core/utf8/strpos.php b/system/core/utf8/strpos.php
deleted file mode 100644
index 4a34dbe9..00000000
--- a/system/core/utf8/strpos.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * utf8::strpos
- *
- * @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 _strpos($str, $search, $offset = 0)
-{
-	$offset = (int) $offset;
-
-	if (SERVER_UTF8)
-		return mb_strpos($str, $search, $offset);
-
-	if (utf8::is_ascii($str) AND utf8::is_ascii($search))
-		return strpos($str, $search, $offset);
-
-	if ($offset == 0)
-	{
-		$array = explode($search, $str, 2);
-		return isset($array[1]) ? utf8::strlen($array[0]) : FALSE;
-	}
-
-	$str = utf8::substr($str, $offset);
-	$pos = utf8::strpos($str, $search);
-	return ($pos === FALSE) ? FALSE : $pos + $offset;
-}
\ No newline at end of file