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

diff --git a/system/libraries/drivers/Captcha/Word.php b/system/libraries/drivers/Captcha/Word.php
deleted file mode 100644
index 856bd9b4..00000000
--- a/system/libraries/drivers/Captcha/Word.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * Captcha driver for "word" style.
- *
- * $Id: Word.php 3769 2008-12-15 00:48:56Z zombor $
- *
- * @package    Captcha
- * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
- */
-class Captcha_Word_Driver extends Captcha_Basic_Driver {
-
-	/**
-	 * Generates a new Captcha challenge.
-	 *
-	 * @return  string  the challenge answer
-	 */
-	public function generate_challenge()
-	{
-		// Load words from the current language and randomize them
-		$words = Kohana::lang('captcha.words');
-		shuffle($words);
-
-		// Loop over each word...
-		foreach ($words as $word)
-		{
-			// ...until we find one of the desired length
-			if (abs(Captcha::$config['complexity'] - strlen($word)) < 2)
-				return strtoupper($word);
-		}
-
-		// Return any random word as final fallback
-		return strtoupper($words[array_rand($words)]);
-	}
-
-} // End Captcha Word Driver Class
\ No newline at end of file