merge from 3.0 branch till 1111.

2 files changed, 12 insertions, 0 deletions

diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.page b/demos/blog/protected/Pages/Admin/ConfigMan.page
index 69ee0899..5c6cd53d 100644
--- a/demos/blog/protected/Pages/Admin/ConfigMan.page
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.page
@@ -56,6 +56,16 @@
 	Text="Please enter a number." />

 <br/>

 

+<span class="input-label">Number of recent comments shown</span>

+<com:TTextBox ID="RecentComments" Columns="8"/>

+<com:TRegularExpressionValidator

+	ControlToValidate="RecentComments"

+	ValidationGroup="settings"

+	Display="Dynamic"

+	RegularExpression="[1-9]\d*"

+	Text="Please enter a number." />

+<br/>

+

 <com:TCheckBox ID="PostApproval" Text="New posts need approval" />

 <br/>

 

diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.php b/demos/blog/protected/Pages/Admin/ConfigMan.php
index 6443e5a0..e4b89b3c 100644
--- a/demos/blog/protected/Pages/Admin/ConfigMan.php
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.php
@@ -34,6 +34,7 @@ class ConfigMan extends BlogPage
 			$this->MultipleUser->Checked=TPropertyValue::ensureBoolean($parameters['MultipleUser']);

 			$this->AccountApproval->Checked=TPropertyValue::ensureBoolean($parameters['AccountApproval']);

 			$this->PostPerPage->Text=$parameters['PostPerPage'];

+			$this->RecentComments->Text=$parameters['RecentComments'];

 			$this->PostApproval->Checked=TPropertyValue::ensureBoolean($parameters['PostApproval']);

 			$themes=$this->Service->ThemeManager->AvailableThemes;

 			$this->ThemeName->DataSource=$themes;

@@ -55,6 +56,7 @@ class ConfigMan extends BlogPage
 		$elements[]=$this->createParameter('MultipleUser',$this->MultipleUser->Checked);

 		$elements[]=$this->createParameter('AccountApproval',$this->AccountApproval->Checked);

 		$elements[]=$this->createParameter('PostPerPage',$this->PostPerPage->Text);

+		$elements[]=$this->createParameter('RecentComments',$this->RecentComments->Text);

 		$elements[]=$this->createParameter('PostApproval',$this->PostApproval->Checked);

 		$themeName=$this->ThemeName->SelectedItem->Text;

 		$elements[]=$this->createParameter('ThemeName',$themeName);