diff options
| -rw-r--r-- | .gitattributes | 6 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rwxr-xr-x | demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page | 2 | ||||
| -rwxr-xr-x | demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php | 4 | ||||
| -rwxr-xr-x | demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png) | bin | 10711 -> 10711 bytes | |||
| -rwxr-xr-x | demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png) | bin | 9550 -> 9550 bytes | |||
| -rwxr-xr-x | demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png) | bin | 783 -> 783 bytes | |||
| -rw-r--r-- | framework/I18N/core/CultureInfo.php | 2 |
8 files changed, 11 insertions, 7 deletions
diff --git a/.gitattributes b/.gitattributes index b83488ab..1ba435cd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1296,9 +1296,9 @@ demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text demos/quickstart/protected/pages/ActiveControls/Home.page -text demos/quickstart/protected/pages/ActiveControls/Introduction.page -text demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png -text svneol=unset#image/png demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCheckBox/Home.page -text @@ -1,6 +1,10 @@ Version 3.2 to be released NEW: Issue#83 - PHP configuration style (Carl) +Version 3.1.6 to be released +BUG: Issue#98 - Missing file in quickstart demo (Chrisotphe) +BUG: Issue#164 - CultureInfo::validCulture should be declared as a static method (Christophe) + Version 3.1.5 May 24, 2009 BUG: Issue#55 - TPropertyAccess.get and has don't recognize magic getter __get (Yves) BUG: Issue#68 - TSqlMapConfig::createSqlMapGateway(): assign current connection to cached TSqlMapManager to avoid loosing active transaction (Yves) diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page index 89d64110..a826f5a8 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page @@ -38,7 +38,7 @@ } .trash-hover { - background-image: url(<%~ assets/trash.png%>); + background-image: url(<%~ images/trash.png%>); } </style> diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php index 276ee6a4..0e4f6193 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php @@ -20,12 +20,12 @@ class Home extends TPage return array ( array ( 'ProductId' => 'Product1', - 'ProductImageUrl' => $this->publishAsset('assets/product1.png'), + 'ProductImageUrl' => $this->publishAsset('images/product1.png'), 'ProductTitle' => 'Cup' ), array ( 'ProductId' => 'Product2', - 'ProductImageUrl' => $this->publishAsset('assets/product2.png'), + 'ProductImageUrl' => $this->publishAsset('images/product2.png'), 'ProductTitle' => 'T-Shirt' ) ); diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png Binary files differindex ae03d551..ae03d551 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png Binary files differindex 25e81ad7..25e81ad7 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png Binary files differindex 184f7628..184f7628 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php index 7ee50bba..18aae74d 100644 --- a/framework/I18N/core/CultureInfo.php +++ b/framework/I18N/core/CultureInfo.php @@ -218,7 +218,7 @@ class CultureInfo * @param string a culture
* @return boolean true if valid, false otherwise.
*/
- public function validCulture($culture)
+ public static function validCulture($culture)
{
if(preg_match('/^[_\\w]+$/', $culture))
return is_file(self::dataDir().$culture.self::fileExt());
|
