adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12018 commits 7 branches 0 tags 44 MiB
Commit graph

1748 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
55d4fd3be3 Merge pull request #318 from shama/folder-test 
Add test cases to include $exceptions with Folder::chmod()
 2011-11-15 09:57:48 -08:00
Ceeram
9fd04307ff adding sort on testresults, to avoid incorrect order returned by MySQL 2011-11-15 17:18:27 +01:00
Kyle Robinson Young
1ebaaf4dd1 Update to assertEquals on Folder tests 2011-11-15 08:18:05 -08:00
Ceeram
bc5b6f7cb2 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-11-15 16:47:38 +01:00
Ceeram
37a932b6a7 adding testcase for saving habtm associations with no primary model data set 2011-11-15 16:47:25 +01:00
Kyle Robinson Young
d725869507 Add test cases to include $exceptions with Folder::chmod() 2011-11-14 23:58:58 -08:00
Kyle Robinson Young
3248e34819 Add @link to File and Folder utilities 2011-11-14 22:40:02 -08:00
Kyle Robinson Young
4e8239a2a5 Add missing @link to docs if available to helpers 2011-11-13 22:08:20 -08:00
mark_story
87f5b6cf26 Fix more strict errors. 
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
 2011-11-13 20:47:55 -05:00
Jose Lorenzo Rodriguez
de5a4ead25 Releasing 2.0.3 2011-11-13 20:32:23 -04:30
Jose Lorenzo Rodriguez
7658af354c Removing var_dump from test cases 2011-11-13 19:54:07 -04:30
mark_story
3f506b287b Rename file. 
Fix build error caused by legacy workaround fixes.
 2011-11-13 16:48:52 -05:00
mark_story
ccefe02de9 Fix issue with duplicate class inclusions. 
When trying to load a class that shared a prefix with an existing
class on case insensitive file systems duplicate class errors could
occur.  This would happen primarily with models and missing model classes.

Fixes #2223
 2011-11-13 16:15:32 -05:00
Kyle Robinson Young
dba4d21492 Add @link to App docblocks and missing _packageFormat docblock 2011-11-13 10:18:42 -08:00
mark_story
9347ca2dc8 Fix requestAction post simulation. 
POST data should not trigger notice errors.
Also fix issue where POST data could not be simulated with a
string URL.

Fixes #2248
 2011-11-13 09:44:48 -05:00
mark_story
a7fcb0a61c Fix more strict errors. 2011-11-12 21:42:20 -05:00
mark_story
17ffcde505 Update test. 
Add fixtures so app tables aren't touched.
Replace construction with method calls.
 2011-11-12 21:42:20 -05:00
mark_story
2c7854cc2f Replace complicated $$foo with simple variable. 2011-11-12 21:42:20 -05:00
mark_story
42f9f8e2c3 Fixing strict errors. 
While this is a minor API change, its required to
make CakePHP pass E_STRICT in testing.
 2011-11-12 21:42:20 -05:00
mark_story
0a0a09920b Updating for PHP5.4 
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
 2011-11-12 21:42:19 -05:00
Ceeram
0c0bb60486 avoid MissingPluginExceptions 2011-11-13 03:29:54 +01:00
Ceeram
d8194a5818 Merge commit '2890e6659ecb6f315c82253e6985ece0e6dc489d' into 2.0 2011-11-12 18:09:58 +01:00
mark_story
92688e2a49 Fix keying in SessionHelper::flash() 
It shouldb e looking for the plugin in the params key.  This
makes SessionHelper compatible with SessionComponent.
 2011-11-12 11:54:57 -05:00
mark_story
3ad50a2591 Fix session flash with plugins. 
Fix using plugin elements for SessionHelper::flash()
Fixes #2246
 2011-11-12 11:03:17 -05:00
mark_story
5934a7a324 Fix html coverage reporting. 
HTML coverage reports now work with PHPUnit 3.6
Fixes #2235
 2011-11-11 22:13:20 -05:00
mark_story
ee6d1cfdf0 Adding changes to test controller. 
Refs #2198
 2011-11-11 21:39:30 -05:00
mark_story
99caa98df3 Update message for PHPUnit3.6 2011-11-11 21:28:34 -05:00
mark_story
493ce3a442 Fix issue where REST actions were not easily testable. 
Fixes #2198
 2011-11-11 21:28:33 -05:00
Kyle Robinson Young
7df3252d6b Add missing @link to TimeHelper docblocks and correct @return 2011-11-11 10:51:14 -08:00
mark_story
7d756fda81 Fix Helper::field() for Model.min 
This field would be treated as a field suffix even though
it is not. Expand existing tests, and reformat some code.

Fixes #2240
 2011-11-10 22:22:11 -05:00
mark_story
0b0d180aad Changing how insertMulti handles boolean values. 
Binding values individually allows boolean to work correctly.
 2011-11-09 22:31:06 -05:00
mark_story
1487357ba6 Convert another long test to use a dataprovider. 2011-11-09 21:25:12 -05:00
mark_story
bc40a55f20 Re-factor dispatcher asset test to use a data provider. 2011-11-09 21:25:11 -05:00
Ceeram
767d1afcd8 fixing helptext for AclShell 2011-11-09 21:07:01 +01:00
teddyzeenny
bdbc34bbed Remove session.save_handler from php ini array 2011-11-09 16:40:32 +02:00
mark_story
89ced25fad Making HttpResponse more tolerant of line endings. 2011-11-08 19:23:36 -05:00
Ceeram
cfbc6d4989 adding extra test, disproves ticket [#2233 state:works-for-me] 2011-11-08 20:29:33 +01:00
Mark Story
e8e2bbc4d7 Merge pull request #304 from jamiemill/2.0-upgradefix2 
Add exception migration to the upgrade shell.
 2011-11-08 06:47:52 -08:00
Kyle Robinson Young
1b95b01265 Fix docblock formatting with Time Helper Test 2011-11-07 22:16:55 -08:00
mark_story
2c91f119cb Remove redundant check. 2011-11-07 23:17:08 -05:00
Mark Story
946753acde Merge pull request #306 from shama/patch-2 
Fix incorrect toQuarter docblock return tag
 2011-11-07 06:18:44 -08:00
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task 
Fix for 'datasource' key when baking another db config.
 2011-11-07 01:58:54 -08:00
Renan Gonçalves
f09904ca91 Merge branch 'patch-time-gmt' of https://github.com/shama/cakephp into shama-patch-time-gmt 2011-11-07 10:44:28 +01:00
Ceeram
7224de962e removing unused variable, fixes #2227 2011-11-07 09:19:01 +01:00
Kyle Robinson Young
72502e8fec Remove extra fromString in TimeHelper::gmt and update docblock 2011-11-06 22:54:52 -08:00
Kyle Robinson Young
09300433f5 Fix incorrect toQuarter docblock return tag 2011-11-06 22:26:58 -08:00
Majna
57afa1873e Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes. 2011-11-07 01:01:56 +01:00
jamiemill
e16890225c Fixed mistake in UpgradeShell::exceptions() 
My fault ;)
 2011-11-06 23:19:30 +00:00
jamiemill
c966a35beb Fixed bug in UpgradeShell::findFiles(). 
$this->_files was reset on each loop through paths, which means, for
example, if you still had the old 'views' directory kicking around
the results from 'View' would be overwritten.
 2011-11-06 21:53:20 +00:00
jamiemill
4368b62dfb Added an 'exceptions' method to the UpgradeShell. 
This just replaces some of the basic cakeError() calls with
equivalent exceptions.
 2011-11-06 21:53:11 +00:00
jamiemill
1d52dc05e1 Fix for UpgradeShell::helpers() not discovering core helpers. 2011-11-06 21:53:03 +00:00
Mark Story
6fd69b022d Merge pull request #303 from shama/patch-1 
Remove 5.3 notice from Config/core timezone comment
 2011-11-06 13:47:31 -08:00
mark_story
d87f9f060b Make parent method check explicit to Shell. 
This makes only methods on Shell inaccessible on the command line.
Parent methods in AppShell or other parent classes can now be called directly.
Fixes #2193
 2011-11-06 16:32:51 -05:00
Kyle Robinson Young
b2414a777f Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment 2011-11-06 13:17:07 -08:00
Mark Story
db41a7dd16 Merge pull request #302 from majna/2.0-viewtask-methods 
Fix View task generating only 'admin' methods views in non-interactive mode.
 2011-11-06 12:59:38 -08:00
ADmad
01aa91b3cf Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225 2011-11-07 02:04:57 +05:30
mark_story
aae8a89623 Change var -> public in controllertask. 
Makes the confirmation message and generated code the same.
Fixes #2216
 2011-11-06 11:50:16 -05:00
mark_story
3fa0bdb60f Revert "Fix missing objects in App::objects()" 
This change caused non controller objects to show in the
controller list.  Reverting until a better implementation
can be done.

This reverts commit ba6f3c17fa.
 2011-11-06 11:24:33 -05:00
mark_story
cfe38985cf Fix failing tests caused by changes in App::objects() 2011-11-06 11:23:11 -05:00
Majna
d84b66e744 Fix View task generating only 'admin' methods views in non-interactive mode. 2011-11-06 16:14:55 +01:00
ADmad
a7d08a6b39 Removed unused option triggerDisabled from ObjectCollection::trigger(). 
Fixed docblock for ObjectCollection::load();
 2011-11-06 20:29:46 +05:30
mark_story
ba6f3c17fa Fix missing objects in App::objects() 
App::objects() should include core objects when asking
for application objects.
 2011-11-06 09:42:15 -05:00
mark_story
3e54ffd8c1 Defaulting autoMock to true. 
This fixes issues with mock controllers being discarded after use.
Not always mocking controllers causes issues with using redirect().

Fixes #2200
 2011-11-06 09:36:35 -05:00
jamiemill
13ebd60b26 Removed invalid 'Helper' suffix in UpgradeShell::helpers() 2011-11-06 12:02:19 +00:00
jamiemill
6c9c36bc0e Fixed missing array wrap in UpgradeShell::tests() 2011-11-05 22:18:49 +00:00
mark_story
c2eae6caf8 Nerfing coverage generation with PHPUnit3.6 for now. 
PHPUnit3.6 totally changed how coverage data can be accessed, its going
to take some time to update things.  This is a quick work around until
more time can be dedicated to fixing it.
 2011-11-05 17:46:59 -04:00
mark_story
ad237ec681 Don't collect code coverage on every request. 2011-11-05 17:29:55 -04:00
mark_story
61d6a720d6 Add test for using autoMock and multiple redirects. 
Having multiple redirects and not calling generate() before each test, or
using autoMock results in an exit.  This is related to
[c5ca10ca69] where controller re-use was removed.

Refs #2200
 2011-11-05 17:28:13 -04:00
Graham Weldon
812e449680 Created a buffer for CakeResponse testing 2011-11-06 08:21:10 +11:00
mark_story
15753ab641 Apply patch from 'Carlos Gant' 
Remove un-necessary loop when deleting without cascade.
Fixes #2050
 2011-11-05 16:16:13 -04:00
Majna
3374406bbf Fix View task missing 'app' param when baking custom action. 2011-11-05 19:54:21 +01:00
mark_story
cd81f9c30a Fix comment in I18n 
Move construction details to a protected constructor.
Fixes #2222
 2011-11-05 08:19:57 -04:00
Marko Marković
4e702b2fae Updated test for debug 
It now detects being called from CLI
 2011-11-05 10:24:46 +01:00
mark_story
bfd95d0e04 Fixing remaining failing tests in PHPUnit 3.6 2011-11-04 22:54:09 -04:00
mark_story
d68053c4d4 Fix exception expectations. 
PHPUnit 3.6 does not allow you to expect the generic Exception
class.
 2011-11-04 22:54:08 -04:00
mark_story
13900dc75c Starting to fix issues with PHPUnit 3.6 compatibility. 2011-11-04 22:54:08 -04:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
Majna
1455c59e0c Fix notice when baking db config: Undefined variable 'driver'. 2011-11-04 22:49:38 +01:00
Marko Marković
c7363bb042 Updated tests for debug() 2011-11-04 19:43:43 +01:00
Jose Lorenzo Rodriguez
b983aa9192 Small optimization in DboSource 2011-11-04 10:01:45 -04:30
Marko Marković
73429b357f Fixed inconsistent debug parameters and empty '(line )' 2011-11-04 14:58:06 +01:00
Jose Lorenzo Rodriguez
926ac32549 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-11-03 21:21:38 -04:30
Jose Lorenzo Rodriguez
2711178b4b Fixing Content-Length calculation when there is buffered output that will be sent before the response body. fixes #2208 2011-11-03 21:09:30 -04:30
mark_story
a929951038 Fix issue with Controller::setAction() 
Calling setAction did not modify which view file was
rendered.  This was a regression with 1.3

Fixes #2212
 2011-11-03 20:13:41 -04:00
Majna
51ccbad170 Fixing ignored '--exclude-plugins' option on Windows for Extract task. 2011-11-03 21:34:32 +01:00
Jose Lorenzo Rodriguez
606c30b77f Releasing 2.0.2 2011-11-02 23:44:50 -04:30
mark_story
98a8f44fa7 Make formatting tag removal smarter. 
Instead of removing all tags, only known
formatting tags.

Fixes #2203
 2011-11-02 21:50:16 -04:00
mark_story
18a34c03a4 Fix issue where unknown exceptions would be squashed. 
Fix issue where unknown exceptions with error codes that were not
in HTTP ranges would be ignored.  In development those messages
should display.

Fixes #2205
 2011-11-02 21:21:48 -04:00
mark_story
201231cd42 Fix encoding issues with debug(). 
Fixes #2199
 2011-11-02 13:45:34 -04:00
Jose Lorenzo Rodriguez
3fc6d293fc Fixing regression in ControllerTestCase after changes done in RequestHandlerComponent 2011-11-01 13:49:40 -04:30
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +01:00
Lubos Remplik
985dcad802 MimeType audio/ogg added 2011-11-01 08:17:36 -07:00
mark_story
f531e7f24b Fix UUID issue in SQLite 
Only varchar(36) was interpreted as a uuid.  char(36)
should also be treated this way.  Most documentation refers
to this type.  Also char(x) fields should be treated as strings,
not text.

Fixes #2184
 2011-10-31 23:10:48 -04:00
mark_story
550076d75e Fix issue in RequestHandlerComponent. 
Fixes issues where response and request properties would
not be set as the initialize() callback would have not fired.

Fixes #2190
Fixes #2189
 2011-10-31 22:41:43 -04:00
mark_story
6623b7dc9d Update generated cache files. 
- Cache files should contain a response object on the controller.
  Without it bad things happen.
- Include the $request and $response contructor arguments for Controller.
- Update import -> uses()

Refs #2190
 2011-10-31 22:27:43 -04:00
mark_story
bf43a5ee24 Fix whitespace and add usage to doc block. 2011-10-31 21:56:16 -04:00
Yasushi Ichikawa
4aeb5b461d delete App::uses Multibyte class. It is no longer needed. 2011-10-31 23:47:36 +09:00
Yasushi Ichikawa
f39c683130 check mbstring.func_overload before using strlen() 2011-10-31 23:29:59 +09:00
Yasushi Ichikawa
e53287583e return byte length instead of number of characters in Content-Length 2011-10-31 18:31:08 +09:00
Jose Lorenzo Rodriguez
7141dff5d1 Releasing 2.0.1 2011-10-30 18:28:32 -04:30
Jose Lorenzo Rodriguez
d49096aab9 Fixing DbConfigTask to produce correct configurations 2011-10-30 18:25:43 -04:30
José Lorenzo Rodríguez
f51be0a82c Merge pull request #278 from Danielpk/enhancement_auth_deny 
Added enhancement to AuthComponent::deny().
 2011-10-30 15:38:21 -07:00
mark_story
92f9a6c1db Fix missing urlencod/urldecode in routing. 
Named params and passed args should be urlencoded, as they
may contain non-ascii characters.

Refs GH-214
 2011-10-29 20:42:07 -04:00
Daniel Pakuschewski
7cde0b654c Removed tests for deny('*') to prevent people get confused with it 2011-10-29 13:57:04 -02:00
Daniel Pakuschewski
09579198a9 Droped support to deny('*'). 2011-10-29 13:54:35 -02:00
Jose Lorenzo Rodriguez
66cf86c154 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-28 23:46:13 -04:30
Jose Lorenzo Rodriguez
60e3f02eac Setting a correct Content-Length for plugin assets 2011-10-28 23:45:31 -04:30
mark_story
ce9bb6b632 Fix validation detection in FormHelper 
string values for validation means a single validation method.
That implies the field is required.

Fixes #2181
 2011-10-28 21:35:43 -04:00
Mark Story
11e2ef6674 Merge pull request #281 from majna/2.0-schema-dump 
Added missing 'write' param for schema dump shell. Fixes #2179.
 2011-10-28 16:56:40 -07:00
Majna
14efc4daae Added missing 'write' param for schema dump shell. Fixes #2179. 2011-10-29 00:51:40 +02:00
Juan Basso
e682b446e6 Added space back to not break the test case. 2011-10-28 18:48:38 -04:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
José Lorenzo Rodríguez
8945dcbf57 Adding test case for previous commit 2011-10-27 22:53:20 -05:30
José Lorenzo Rodríguez
29ca42ed7a Not sending a content-length for redirection status codes that are not supposed to have any content 2011-10-27 22:44:42 -05:30
Jose Lorenzo Rodriguez
9866882506 Not sending a content-length for redirection status codes that are not supposed to have any content 2011-10-27 23:18:49 -04:30
Jose Lorenzo Rodriguez
aabfad9a09 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-27 22:25:37 -04:30
Jose Lorenzo Rodriguez
4a453cc384 Fixes #2175 
Adding automatic Content-Length header to hint browser of the end of the response when using persistent connections
 2011-10-27 22:15:37 -04:30
mark_story
adf52235d0 Make h() not puke when objects are passed in. 
This can happen in the default Exception rendering,
if an object is in the viewVars.
 2011-10-27 21:30:50 -04:00
mark_story
8529d76e6f Removing Xml prolog from default xml layouts. 
Both DOMDocument and SimpleXML output the prolog when
saving xml.

Fixes #2171
 2011-10-27 20:58:03 -04:00
Jose Lorenzo Rodriguez
95acaba295 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-27 10:06:30 -04:30
Renan Gonçalves
53be552370 Fixing use of options['exclude'] in Debugger::trace(), tests added. 2011-10-27 16:01:54 +02:00
Daniel Luiz Pakuschewski
eb6c07f77e Fixed: _passedArgs now is _passedVars 2011-10-27 10:16:38 -02:00
Daniel Luiz Pakuschewski
24bb6663ab Fixed typo 2011-10-27 10:10:57 -02:00
mark_story
24fd87398d Fix issue with 0.Model.field inputs. 
These inputs would be incorrectly prefixed with another Model name.
 2011-10-26 23:46:15 -04:00
Jose Lorenzo Rodriguez
bc8b522eec Merge remote-tracking branch 'origin/2.0' into 2.0 2011-10-26 22:33:24 -04:30
Jose Lorenzo Rodriguez
ee7f417085 Test to disprove #2123, it is possible to load classes in plugin's Lib directory. App::uses() is intended for classes not procedural files. 2011-10-26 22:33:14 -04:30
mark_story
43df8d34e7 Use String::tokenize() to split up fields. 
It is slightly more intelligent than explode()
Solves basic problems in Sqlite with virtualFields.

Fixes #2163
 2011-10-26 21:17:20 -04:00
m
010abd9e18 Inheritance fix for CakeTestCase 
Fix overriden methods to be static like other methods in
PHPUnit_Framework_Assert.
Fixes #2170

Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-26 20:28:42 -04:00
Daniel Luiz Pakuschewski
8738ef3dc2 Added tests to deny() and deny('*') 2011-10-26 22:07:57 -02:00
Daniel Luiz Pakuschewski
5246e7dd1d Allow AuthComponent to deny all actions with single deny() or deny('*') 2011-10-26 22:07:17 -02:00
ADmad
1244656595 Prevent unneeded afterFind callback triggering on associated models. Fixes #2057 2011-10-26 19:36:32 +05:30
ADmad
8473d6a660 Fixed code formatting 2011-10-26 13:00:52 +05:30
m
5a5a542a71 Missing ini_set of include path for test.php 
Fixes #2167

Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-25 22:26:59 -04:00
Maggion Emmanuel
3dc9fee5c0 Typo 2011-10-25 22:22:10 -04:00
mark_story
c2c63d373c Fix incorrect field detection for habtm fields. 
Fields on habtm models would always be treated as multiselects.
Even when there were additional fields specified.

Fixes #2153
 2011-10-25 22:21:27 -04:00
mark_story
5efddd11c8 Add comment for test. 2011-10-25 21:08:56 -04:00
mark_story
477c492e86 Fix issue where named parameters would not be urldecoded. 
Fixes #2155
 2011-10-25 21:07:27 -04:00
mark_story
7547d2c2d1 Update doc block concerning plugins. 
Fixes #2146
 2011-10-25 20:33:55 -04:00
mark_story
d92c73d821 Remove reference to XmlHelper. 
Refs #2164
 2011-10-25 20:16:58 -04:00
mark_story
e80c548887 Update link on home page. 
Fixes #2159
 2011-10-25 12:36:13 -04:00
m
dcc17f2091 ucfirst object names part two (Folder/File) 
Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-24 21:36:48 -04:00
mark_story
621cb43e93 Add Opera Mobi to mobile detectors. 
This was missed in a merge with 1.3.
Fixes #2087
 2011-10-24 21:12:06 -04:00
mark_story
bd87400131 Fix inflection for words ending in media. 
Fixes #2149
 2011-10-24 21:05:56 -04:00
fiblan
9c4a9bbd06 Fix missing prefix when reading table schema. 
When using prefixes, table metadata would be lost.
Fixes #1522

Signed-off-by: mark_story <mark@mark-story.com>

Conflicts:

	lib/Cake/Model/CakeSchema.php
 2011-10-24 20:40:47 -04:00
Majna
42042c2a76 Fixing incorrect theme view doc block. 2011-10-24 16:32:19 +02:00
mark_story
d6bf1479c8 Add documentation and test for FormHelper::select() 
An alternate syntax was undocumented and untested.  Fix that.
Refs #1794
 2011-10-23 22:27:07 -04:00
mark_story
d62351eb36 Revert the changes done to remove the 'cake' domain 
After some discussion, polutting the app POT file
with unchanging Cake strings was incorrect.  Having these
strings in a separate POT file allows reuse of translations across
projects.

Refs #2103
 2011-10-23 20:36:31 -04:00
Majna
a9dbde0cbd Fixing incorrect doc blocks regarding error handler. 2011-10-23 21:55:20 +02:00
mark_story
205d75587c Move registration of CakePlugin. 
Move the uses() call to Cake/bootstrap.php
CakePlugin is used by App, and should be loaded along with
other core classes like Configure and Cache.

Fixes #2147
 2011-10-23 13:54:13 -04:00
mark_story
e457c14dec Fix issues with stateless authentication. 
Cookies and sessions are no longer required for stateful authentication.
AuthComponent::user() also works correctly in these situations as well.

Fixes #2134
 2011-10-23 12:54:51 -04:00