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

diff --git a/system/libraries/drivers/Captcha/Math.php b/system/libraries/drivers/Captcha/Math.php
deleted file mode 100644
index 4ac20248..00000000
--- a/system/libraries/drivers/Captcha/Math.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * Captcha driver for "math" style.
- *
- * $Id: Math.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_Math_Driver extends Captcha_Driver {
-
-	private $math_exercice;
-
-	/**
-	 * Generates a new Captcha challenge.
-	 *
-	 * @return  string  the challenge answer
-	 */
-	public function generate_challenge()
-	{
-		// Easy
-		if (Captcha::$config['complexity'] < 4)
-		{
-			$numbers[] = mt_rand(1, 5);
-			$numbers[] = mt_rand(1, 4);
-		}
-		// Normal
-		elseif (Captcha::$config['complexity'] < 7)
-		{
-			$numbers[] = mt_rand(10, 20);
-			$numbers[] = mt_rand(1, 10);
-		}
-		// Difficult, well, not really ;)
-		else
-		{
-			$numbers[] = mt_rand(100, 200);
-			$numbers[] = mt_rand(10, 20);
-			$numbers[] = mt_rand(1, 10);
-		}
-
-		// Store the question for output
-		$this->math_exercice = implode(' + ', $numbers).' = ';
-
-		// Return the answer
-		return array_sum($numbers);
-	}
-
-	/**
-	 * Outputs the Captcha riddle.
-	 *
-	 * @param   boolean  html output
-	 * @return  mixed
-	 */
-	public function render($html)
-	{
-		return $this->math_exercice;
-	}
-
-} // End Captcha Math Driver Class
\ No newline at end of file