From 550ba06593b467b643862d41a00ca2dd12ee704b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 2 Aug 2006 02:24:29 +0000
Subject: merge from 3.0 branch till 1320.

---
 requirements/index.php       | 7 +------
 requirements/messages-bg.txt | 3 +--
 requirements/messages-zh.txt | 3 +--
 requirements/messages.txt    | 3 +--
 4 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'requirements')

diff --git a/requirements/index.php b/requirements/index.php
index a94c92cf..fb58dfce 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -32,13 +32,8 @@
 $requirements = array(
 	array(
 		true,
-		version_compare(PHP_VERSION,"5.0.4",">="),
-		'PHP version check',
-		'PHP 5.0.4 or higher required'),
-	array(
-		false,
 		version_compare(PHP_VERSION,"5.1.0",">="),
-		'PHP version check','PHP 5.1.0 or higher preferred'),
+		'PHP version check','PHP 5.1.0 or higher required'),
 	array(
 		true,
 		isset($_SERVER["HTTP_ACCEPT"]),
diff --git a/requirements/messages-bg.txt b/requirements/messages-bg.txt
index ea54f02c..e1be6b5d 100644
--- a/requirements/messages-bg.txt
+++ b/requirements/messages-bg.txt
@@ -2,8 +2,7 @@
 passed with warnings			= Конфигурацията на вашия сървър удовлетворява минималните изисквания на PRADO. Моля, обърнете внимание на предупрежденията по-долу.
 failed					= За съжаление, вашият сървър не удовлетворява изискванията на PRADO.
 PHP version check			= Проверка за версията на PHP
-PHP 5.0.4 or higher required		= Изисква се PHP 5.0.4 или по-висока версия.
-PHP 5.1.0 or higher preferred		= Препоръчва се PHP 5.1.0 или по-висока версия. Това ще предотврати грешката предизвикана от рекурсивните __get/__set извиквания.
+PHP 5.1.0 or higher required		= Изисква се PHP 5.1.0 или по-висока версия.
 SQLite extension check			= Проверка за SQLite
 SQLite extension optional		= SQLite разширението е незадължително. Ако не е заредено, няма да можете да ползвате TSqliteCache.
 Memcache extension check		= Проверка за Memcache
diff --git a/requirements/messages-zh.txt b/requirements/messages-zh.txt
index b86d96cf..6ee6e2c4 100644
--- a/requirements/messages-zh.txt
+++ b/requirements/messages-zh.txt
@@ -2,8 +2,7 @@
 passed with warnings = 您的服务器配置符合PRADO的最低要求。请关注以下的警告信息。
 failed = 对不起，您的服务器配置不符合PRADO的要求。
 PHP version check = PHP版本检查
-PHP 5.0.4 or higher required = PRADO需要PHP 5.0.4或更高版本。
-PHP 5.1.0 or higher preferred = PRADO推荐使用PHP 5.1.0或更高版本。它将避免由于递归调用__get/__call引起的错误。
+PHP 5.1.0 or higher required = PRADO需要PHP 5.1.0或更高版本。
 SQLite extension check = SQLite模块检查
 SQLite extension optional = SQLite模块是可选的。如果它不存在，您将无法使用TSQLiteCache。
 Memcache extension check = Memcache模块检查
diff --git a/requirements/messages.txt b/requirements/messages.txt
index ccda04b2..5c1a1364 100644
--- a/requirements/messages.txt
+++ b/requirements/messages.txt
@@ -2,8 +2,7 @@ all passed							= Congratulations! Your server configuration satisfies all requ
 passed with warnings				= Your server configuration satisfies minimum requirements by PRADO. Please pay attention to the warnings listed below.
 failed								= Sorry, your server configuration does not satisfy the requirements by PRADO.
 PHP version check					= PHP version check
-PHP 5.0.4 or higher required		= PHP version 5.0.4 or higher is required by PRADO.
-PHP 5.1.0 or higher preferred		= PHP version 5.1.0 or higher is preferred by PRADO. It eliminates the error caused by recursive __get/__set calls.
+PHP 5.1.0 or higher required		= PHP version 5.1.0 or higher is required by PRADO.
 SQLite extension check				= SQLite extension check
 SQLite extension optional			= SQLite extension is optional. If it is absent, you will not be able to use TSqliteCache.
 Memcache extension check			= Memcache extension check
-- 
cgit v1.2.3