diff options
| author | xue <> | 2006-11-04 03:33:00 +0000 |
|---|---|---|
| committer | xue <> | 2006-11-04 03:33:00 +0000 |
| commit | 3850edb7440923c6296026c658d53f44faceff55 (patch) | |
| tree | 3b65305deeac2cc151d2d7fcad9f5d93af2a2207 /framework/Web | |
| parent | e34500aaf1a58b05ddcc6421631a586ca9c99b77 (diff) | |
merge from 3.0 branch till 1489.
Diffstat (limited to 'framework/Web')
| -rw-r--r-- | framework/Web/Services/TPageService.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/TTemplateManager.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TDataGridColumn.php | 5 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TTableCell.php | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php index 3e33fbb4..5d9e74fb 100644 --- a/framework/Web/Services/TPageService.php +++ b/framework/Web/Services/TPageService.php @@ -375,7 +375,7 @@ class TPageService extends TService }
/**
- * @return string root directory (in namespace form) storing pages. Defaults to 'pages' directory under application base path.
+ * @return string the root directory for storing pages. Defaults to the 'pages' directory under the application base path.
*/
public function getBasePath()
{
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index 8c4983bf..950f2c70 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -746,7 +746,7 @@ class TTemplate extends TApplicationComponent implements ITemplate }
catch(Exception $e)
{
- if($e->getErrorCode()==='template_format_invalid' || $e->getErrorCode()==='template_format_invalid2')
+ if(($e instanceof TException) && ($e->getErrorCode()==='template_format_invalid' || $e->getErrorCode()==='template_format_invalid2'))
throw $e;
if($matchEnd===0)
$line=$this->_startingLine+1;
diff --git a/framework/Web/UI/WebControls/TDataGridColumn.php b/framework/Web/UI/WebControls/TDataGridColumn.php index 30349244..f0d088d2 100644 --- a/framework/Web/UI/WebControls/TDataGridColumn.php +++ b/framework/Web/UI/WebControls/TDataGridColumn.php @@ -346,9 +346,8 @@ abstract class TDataGridColumn extends TApplicationComponent }
break;
case TDataGrid::IT_FOOTER:
- if(($text=$this->getFooterText())==='')
- $text=' ';
- $cell->setText($text);
+ if(($text=$this->getFooterText())!=='')
+ $cell->setText($text);
break;
}
}
diff --git a/framework/Web/UI/WebControls/TTableCell.php b/framework/Web/UI/WebControls/TTableCell.php index 8b80e1f2..dad2e69b 100644 --- a/framework/Web/UI/WebControls/TTableCell.php +++ b/framework/Web/UI/WebControls/TTableCell.php @@ -185,10 +185,12 @@ class TTableCell extends TWebControl */
public function renderContents($writer)
{
- if(($text=$this->getText())==='')
+ if(($text=$this->getText())!=='')
+ $writer->write($text);
+ else if($this->getHasControls())
parent::renderContents($writer);
else
- $writer->write($text);
+ $writer->write(' ');
}
}
|