diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2014-01-06 22:41:46 +0100 |
|---|---|---|
| committer | David <ottodavid@gmx.net> | 2014-08-21 17:20:54 +0200 |
| commit | fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (patch) | |
| tree | 80fff53aa0d9c60612bc2ca690a46194e9c160cf /framework/Web/UI/WebControls/TTabPanel.php | |
| parent | 48577f63f414dc3078abc4bdc93bde932fe666a6 (diff) | |
Happy 2014!
(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)
Conflicts:
framework/Data/Common/Mssql/TMssqlMetaData.php
framework/Data/Common/Mysql/TMysqlMetaData.php
framework/Data/Common/Oracle/TOracleMetaData.php
framework/Data/Common/Pgsql/TPgsqlMetaData.php
framework/Data/Common/Sqlite/TSqliteMetaData.php
framework/Data/Common/TDbMetaData.php
framework/Web/UI/ActiveControls/TCallbackClientScript.php
framework/Web/UI/JuiControls/TJuiAutoComplete.php
framework/Web/UI/JuiControls/TJuiControlAdapter.php
framework/Web/UI/JuiControls/TJuiDraggable.php
framework/Web/UI/JuiControls/TJuiDroppable.php
framework/Web/UI/JuiControls/TJuiResizable.php
framework/Web/UI/JuiControls/TJuiSelectable.php
framework/Web/UI/JuiControls/TJuiSortable.php
framework/Wsat/TWsatARGenerator.php
framework/Wsat/TWsatService.php
framework/Wsat/pages/TWsatGenerateAR.php
framework/Wsat/pages/TWsatHome.php
framework/Wsat/pages/TWsatLogin.php
framework/Wsat/pages/TWsatScaffolding.php
Diffstat (limited to 'framework/Web/UI/WebControls/TTabPanel.php')
| -rw-r--r-- | framework/Web/UI/WebControls/TTabPanel.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php index 0c6128f1..d3dacbf1 100644 --- a/framework/Web/UI/WebControls/TTabPanel.php +++ b/framework/Web/UI/WebControls/TTabPanel.php @@ -4,7 +4,7 @@ * * @author Tomasz Wolny <tomasz.wolny@polecam.to.pl> and Qiang Xue <qiang.xue@gmail.com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TTabPanel.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Web.UI.WebControls @@ -408,15 +408,15 @@ class TTabPanel extends TWebControl implements IPostBackDataHandler protected function registerStyleSheet() { $url = $this->getCssUrl(); - + if($url === '') { return; } - + if($url === 'default') { $url = $this->getApplication()->getAssetManager()->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'tabpanel.css'); } - + if($url !== '') { $this->getPage()->getClientScript()->registerStyleSheetFile($url, $url); } |