diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Exceptions/TErrorHandler.php | 3 | ||||
| -rw-r--r-- | framework/Web/UI/TPage.php | 12 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/THyperLink.php | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index 7d914fca..913b3ac3 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -152,7 +152,8 @@ class TErrorHandler extends TComponent implements IModule $handling=true;
if(($response=Prado::getApplication()->getResponse())!==null)
$response->clear();
- header('Content-Type: text/html; charset=UTF-8');
+ if(!headers_sent())
+ header('Content-Type: text/html; charset=UTF-8');
if($param instanceof THttpException)
$this->handleExternalError($param->getStatusCode(),$param);
else if(Prado::getApplication()->getMode()==='Debug')
diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php index 46d1d8df..1aa0d40b 100644 --- a/framework/Web/UI/TPage.php +++ b/framework/Web/UI/TPage.php @@ -20,12 +20,12 @@ class TPage extends TTemplateControl * @var array system post fields
*/
private static $_systemPostFields=array(
- self::FIELD_POSTBACK_TARGET=>true,
- self::FIELD_POSTBACK_PARAMETER=>true,
- self::FIELD_LASTFOCUS=>true,
- self::FIELD_PAGESTATE=>true,
- self::FIELD_SCROLLX=>true,
- self::FIELD_SCROLLY=>true,
+ 'PRADO_POSTBACK_TARGET'=>true,
+ 'PRADO_POSTBACK_PARAMETER'=>true,
+ 'PRADO_LASTFOCUS'=>true,
+ 'PRADO_PAGESTATE'=>true,
+ 'PRADO_SCROLLX'=>true,
+ 'PRADO_SCROLLY'=>true,
'__PREVPAGE','__CALLBACKID','__CALLBACKPARAM'
);
/**
diff --git a/framework/Web/UI/WebControls/THyperLink.php b/framework/Web/UI/WebControls/THyperLink.php index 916501a7..a2efe43a 100644 --- a/framework/Web/UI/WebControls/THyperLink.php +++ b/framework/Web/UI/WebControls/THyperLink.php @@ -63,7 +63,7 @@ class THyperLink extends TWebControl $image=new TImage;
$image->setImageUrl($this->resolveClientUrl($imageUrl));
if(($toolTip=$this->getToolTip())!=='')
- $image->setToolTip($toolTip);
+ $image->setAlternateText($toolTip);
if(($text=$this->getText())!=='')
$image->setAlternateText($text);
$image->renderControl($writer);
|