From 65c53d5c56d2d313acf6156c6101fe7aa726251b Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 26 Aug 2011 14:16:21 +0000
Subject: [PATCH] r256
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

фикс генерации капчи при ручном запуске крон задачи git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@256 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                   | 7 ++++---
 upload/includes/captcha/captcha.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index e4e79cc66..29a9ea498 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R253';
-$bb_cfg['tp_release_date'] = '25-08-2011';
+$bb_cfg['tp_release_state'] = 'R256';
+$bb_cfg['tp_release_date'] = '26-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
@@ -510,4 +510,5 @@ $bb_cfg['advert_html_path']            = $bb_cfg['html_path'] .'advert.html';  #
 // Captcha
 $bb_cfg['captcha']['disabled']   = false;
 $bb_cfg['captcha']['secret_key'] = 'secret_key';
-$bb_cfg['captcha']['img_path']   = "./images/captcha/";  # without '/'
+$bb_cfg['captcha']['img_url']    = './images/captcha/';         # without '/'
+$bb_cfg['captcha']['img_path']   = BB_PATH .'/images/captcha/'; # without '/'
diff --git a/upload/includes/captcha/captcha.php b/upload/includes/captcha/captcha.php
index a2f6f0be8..22ad1d2a3 100644
--- a/upload/includes/captcha/captcha.php
+++ b/upload/includes/captcha/captcha.php
@@ -88,7 +88,7 @@ class captcha_common
 		$this->new_code_key = $this->get_key_name(TIMENOW);
 
 		return '
-			<div><img src="'. $this->new_img_path .'?'. mt_rand() .'" width="120" height="72" alt="pic" /></div>
+			<div><img src="'. $this->cfg['img_url'] .'?'. mt_rand() .'" width="120" height="72" alt="pic" /></div>
 			<input type="hidden" name="'. $this->cap_sid_key .'" value="'. $this->new_cap_sid .'" />
 			<input type="text" name="'. $this->new_code_key .'" value="" size="25" class="bold" />
 		';