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

diff --git a/system/libraries/drivers/Captcha/Riddle.php b/system/libraries/drivers/Captcha/Riddle.php
deleted file mode 100644
index 765eeaad..00000000
--- a/system/libraries/drivers/Captcha/Riddle.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * Captcha driver for "riddle" style.
- *
- * $Id: Riddle.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_Riddle_Driver extends Captcha_Driver {
-
-	private $riddle;
-
-	/**
-	 * Generates a new Captcha challenge.
-	 *
-	 * @return  string  the challenge answer
-	 */
-	public function generate_challenge()
-	{
-		// Load riddles from the current language
-		$riddles = Kohana::lang('captcha.riddles');
-
-		// Pick a random riddle
-		$riddle = $riddles[array_rand($riddles)];
-
-		// Store the question for output
-		$this->riddle = $riddle[0];
-
-		// Return the answer
-		return $riddle[1];
-	}
-
-	/**
-	 * Outputs the Captcha riddle.
-	 *
-	 * @param   boolean  html output
-	 * @return  mixed
-	 */
-	public function render($html)
-	{
-		return $this->riddle;
-	}
-
-} // End Captcha Riddle Driver Class
\ No newline at end of file