Phally
1fe424a62b
Moves code out of the try/catch blocks in the connect() methods.
...
That code wouldn't throw a PDOException, so having it in the
try/catch block is pointless. Moving it out makes it easier to
read.
2013-07-15 12:59:46 +02:00
Adam Taylor
5a6f1259e3
Fix the "testAssetUrlNoRewrite" test
...
When running the test in the browser from somewhere other than
http://localhost (e.g. http://foo.dev ), the test was failing.
2013-07-13 23:38:55 -06:00
mark_story
d40c7376ce
Rebalance where URL normalization happens in AuthComponent.
...
Make URL's not include the base path when storing them in the session.
This makes future redirection simpler. When URL's are an array use
Router::url() on them.
Fixes #3916
2013-07-12 21:54:22 -04:00
mark_story
e016f1156f
Revert previous changes.
...
Adding this parameter was a mistake. Remove it.
2013-07-12 21:37:22 -04:00
mark_story
8133f72b53
Update AuthComponent to not strip when normalizing URLs.
...
Revert most of the changes done to fix #3897 originally and try
a different strategy of solving the base path issues and not breaking
apps running in a subdirectory.
Fixes #3916
2013-07-12 21:17:25 -04:00
mark_story
52be365598
Introduce the strip
argument to Router.
...
This allows callers to request that the basepath *not* be stripped off
when normalizing string URL's. This is important in AuthComponent when
handling redirect URL's as the redirect location could point to
a controller that shares a name with the base path.
Refs #3897
Refs #3916
2013-07-12 21:16:18 -04:00
Mark
f9fdc1e6e0
Merge pull request #1408 from dereuromark/master-cleanup
...
remove @access and unnecessary $name
2013-07-12 07:10:23 -07:00
mark_story
494fd05de6
Fix downloading Ranges in files.
...
Correctly handle ranges that don't terminate at the end of the file.
Also reject invalid ranges as described in RFC-2616.
Thanks to Kim Biesbjerg for the initial patch.
Fixes #3914
2013-07-11 23:20:12 -04:00
mark_story
b3273e9cc2
Correct documentation.
...
Options are traditionally above the @param block as it results in easier
to read API docs.
2013-07-11 21:00:11 -04:00
Mark Story
1ecc921e13
Merge pull request #1412 from wernerhp/master
...
Inflector pluralize and singularize update
2013-07-10 08:59:03 -07:00
Werner Pieterson
64ff9ad387
Fixed indenting
2013-07-10 17:51:42 +02:00
Werner Pieterson
3d83c628eb
Added more words to InflectorTest
2013-07-10 17:49:18 +02:00
Werner Pieterson
a27499d88a
Updated Inflector's 'pluralize and singularize to correctly handle addisional words.
...
Updated InflectorTest to test new words.
2013-07-10 17:46:01 +02:00
mark_story
960ce7fa81
Don't use inline assignment.
...
CakePHP generally avoids inline assignment as it can be confusing and do
the wrong thing.
2013-07-09 21:11:06 -04:00
mark_story
cfa260d8c5
Update ServerShell to use provided documentRoot.
...
Fix ServerShell from using the wrong path to the routing script when
a custom document root is used. Thanks to Marko Marković for the patch.
Fixes #3909
2013-07-09 21:10:37 -04:00
mark_story
2918ae9c7a
Update index.php to serve static files with query strings.
...
Trim off the query string before attempting to locate the file on the
filesystem. Thanks to Marko Marković for the initial patch.
Fixes #3910
2013-07-09 21:07:12 -04:00
Rachman Chavik
542d594b86
Fix deprecated value in argument and disable caching
...
This aligns better with changes required in the 3.x branch.
Related: 4bb0a122
2013-07-08 21:55:14 +07:00
euromark
a643295e4c
remove @access and unnecessary $name
2013-07-08 15:50:50 +02:00
Rachman Chavik
0555895de3
Remove leftover temp file
2013-07-07 11:20:37 +07:00
Rachman Chavik
4bb0a1228a
Fix I18n to extract plugin model validation messages
2013-07-07 11:20:14 +07:00
Mark Story
481d3920ae
Merge pull request #1406 from ravage84/formhelper
...
Some minor CS improvements to FormHelper
2013-07-06 13:57:47 -07:00
Marc Würth
a397f034e6
Some love for a deprecated class
...
Whitespace and wording.
Optionally we could include a version number until when this class will work. I assumed this will be 3.0...
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/deprecated.html
I treid that but after I let apigen generate the doc and I saw it did nothing special about it ;-/
2013-07-06 19:50:26 +02:00
Marc Würth
11eeb33644
Some minor CS improvements to FormHelper
...
Replaced use of deprecated method getVar by get.
Improved DocBocks, mostly data types
Removed deprecated DocBock tag because it's an invalid use of such. This makes the method look like it was deprecated but in reality it's only one of the possible values of one of its parameters.
2013-07-06 19:04:06 +02:00
Marc Würth
d9882fcc08
Fixed three @param data types
2013-07-06 16:49:21 +02:00
mark_story
a7213b2e64
Update doc block.
2013-07-05 21:25:06 -04:00
Marc Würth
85a75906d4
Minor doc block improvements
...
http://ch1.php.net/manual/de/exception.construct.php
Second parameter gets only passed by. Exception constructor uses an int for the second parameter,not a string.
Replaced text by docblock @see
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/see.html
2013-07-06 00:27:23 +02:00
euromark
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
euromark
ba02678693
doc block corrections
2013-07-05 16:17:23 +02:00
euromark
c478d60e79
bool to boolean
2013-07-05 16:07:29 +02:00
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
euromark
c989624f80
whitespace coding standards
2013-07-05 14:15:18 +02:00
mark_story
06fc8dbfc1
Update version number to 2.3.7
2013-07-04 22:05:00 -04:00
mark_story
c685f6ca13
Make check for ..
more specific.
...
A `..` anywhere in the classname is invalid.
2013-07-04 21:40:30 -04:00
euromark
a620fbbbb8
fix cs
2013-07-04 13:30:08 +02:00
euromark
f680c763b2
ticket-3902 - paginator and display of order via model default order
2013-07-04 13:07:14 +02:00
euromark
f389435bae
coding standards and else block simplification
2013-07-03 19:27:17 +02:00
euromark
a90cb29c0f
simplify else cases
2013-07-03 01:14:41 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
Jose Lorenzo Rodriguez
58149f2315
Backporting from 2.4 fix for booleans in mysql when running PHP 5.5
2013-07-02 16:51:29 -04:30
Marc Würth
ff1f80349a
Removed superfluous break
...
In every case of the if clause it will return, so break is not needed.
2013-07-02 21:00:24 +02:00
euromark
c671d8da62
use strict comparison for strings
2013-07-02 11:01:02 +02:00
mark_story
2f57a7fb18
Use simpler and faster code.
...
substr_compare() is up to 2x slower than just substr(). Use a faster,
more common, and simpler to read variant of the same thing.
2013-07-01 23:06:56 -04:00
mark_story
521c293eb1
Fix coding standards.
2013-07-01 22:56:00 -04:00
Mark Story
9a08aeafcf
Merge pull request #1377 from ravage84/fix-for-3318
...
Trim off webroot/index.php when determining base and url.
Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it.
Fixes #3318
2013-07-01 19:51:34 -07:00
mark_story
9754789b69
Don't load classnames with ..
in their names.
...
Classnames with . in them are invalid and can be leveraged to load code
outside of an application by traversing directories.
2013-07-01 21:21:20 -04:00
Mark Story
da033cbed7
Merge pull request #1375 from dereuromark/master-cake-email
...
Move boundary calculation inside _render()
2013-07-01 06:12:24 -07:00
Mischa ter Smitten
dad1f16eaf
Made _stop() usage in Consoles / Tasks more consistent
2013-07-01 14:15:54 +02:00
Marc Würth
e84bf65016
Typo in FormAuthenticate.php
2013-07-01 00:03:03 +02:00
Marc Würth
f930a50805
Fix for #3318
...
Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318
It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server.
If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway.
Some code docblock improvements to CakeRequestTest.php
Added test case for fix
Also now you can call just index.php even if you have url rewriting enabled
2013-06-30 05:38:58 +02:00
mark_story
1d18a4f702
Fix issue where redirectURLs were not generated correctly.
...
When the first path segment matches the base path an incorrect URL was
generated. Trimming slashes off makes Router normalize the URL correctly
as the leading / implies that the base is already prepended.
Fixes #3897
2013-06-29 23:26:13 -04:00
mark_story
0d76bfe325
Add an additional test for CakeRequest::referer().
...
Trying to track down the issue for #3897 . This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
euromark
c94fe1b729
also move protected variable resetting into the correct scope
2013-06-29 16:23:55 +02:00
euromark
b346c4af8e
Test to proof that render itself should handle the boundary.
2013-06-29 15:16:58 +02:00
Mark Story
b73f927787
Merge pull request #1381 from ravage84/patch-1
...
Annotated testReconnect
2013-06-27 14:59:29 -07:00
Marc Würth
aabeaada0f
Fixed @return statement in DboSource::disconnect
2013-06-27 17:38:46 +02:00
Marc Würth
9591f55394
Annotated testReconnect
2013-06-27 17:15:56 +02:00
Marc Würth
070a6f0ad5
Added a related cookbook link to DataSource.php
2013-06-26 22:07:52 +02:00
euromark
0ca1ba3211
allow callbacks to modify attachements by moving the decision to calculate boundary value into the correct position inside _render()
2013-06-26 02:20:31 +02:00
Marc Würth
2609016dfe
Changed http links to lighthouse, groups.google and github to https
...
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
ee5e8c95dd
fix issue with FormHelper and undefined variable and extract
2013-06-25 12:11:10 +02:00
euromark
290c343a74
tests to disprove that input date and partial dateFormat does not work
2013-06-25 11:54:29 +02:00
Werner Pieterson
9383236114
Formatted code
...
Formatted code to conform to style guide
2013-06-23 19:49:17 +02:00
Werner Pieterson
b172d6e254
Fixed "delete" translation string bug
2013-06-23 18:10:29 +02:00
ADmad
3e8a7f5e66
Make ScaffoldView extend View instead of deprecated ThemeView
2013-06-22 22:05:31 +05:30
mark_story
94815a74f1
Add ordering to prevent occasional pgsql failures.
2013-06-21 17:47:08 -04:00
Marc Würth
2418ea0a57
Fixed typo in AuthComponent::redirectUrl
2013-06-21 16:49:31 +02:00
mark_story
68db74d32d
Cleanup from previous commit.
...
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0
Fix to the date input year field
...
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
Mark Story
691288accc
Merge pull request #1362 from dereuromark/master-cake-session
...
cake session clarification
2013-06-18 15:05:00 -07:00
euromark
1b1943954b
CakeSession improvements
2013-06-18 23:49:42 +02:00
euromark
eb13242680
assert proper array access for _dateTimeSelected()
2013-06-18 09:39:43 +02:00
mark_story
111bfa43d4
Fix incorrect autolinking when urls end at HTML tags.
...
Fixes #3879
2013-06-15 22:01:29 -04:00
mark_story
fe809cd85d
Remove undocumented magic features for IIS.
...
Undocumented, untested features break very easily. It is best to not
have them where possible.
2013-06-13 18:01:11 -04:00
euromark
4671f235ad
duplicate line removed
2013-06-13 14:15:00 +02:00
José Lorenzo Rodríguez
2f93d781ad
Merge pull request #1349 from renansaddam/smtpTransportReturnPath
...
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport
2013-06-13 05:05:36 -07:00
mark_story
e2d69402e7
Remove dead view cache code.
...
Now that cache files contain the response headers, this is no longer
needed. Remove what is now duplicate code.
Refs #2358
2013-06-12 21:30:42 -04:00
Mark Story
e454f2d2a3
Merge pull request #1334 from thegallagher/2.3-cache-fix
...
Fix content-type header in cached views.
Fixes #2358
2013-06-12 18:27:42 -07:00
Mark Story
57d8c6b412
Merge pull request #1350 from dereuromark/master-post-link-doc-block
...
doc block formhelper postLink
2013-06-12 09:37:08 -07:00
euromark
b5b8885096
doc block formhelper postLink
2013-06-12 18:14:02 +02:00
Mark Story
d52c401ff2
Merge pull request #1348 from thomseddon/consistent-timestamps
...
Unify modified/created times. Both the created/updated timestamps will reflect the same point in time now.
2013-06-12 07:13:48 -07:00
Thom Seddon
305b3f4688
Unify modified/created times
...
The former implementation meant that it was not guarantee that
the times automatically generated for the modified/created fields
would be exactly the same for a given operation.
2013-06-12 13:51:56 +01:00
Renan Gonçalves
796e4b45dd
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport.
...
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
2013-06-12 11:31:49 +02:00
Rik van der Heijden
e7d2892e81
Fixed unit-test locales
2013-06-11 20:18:40 +02:00
Frank de Graaf
f79a258a64
Minor optimization of CakeEmail::_wrap().
2013-06-11 00:53:25 +03:00
Mark Story
e77d49f554
Merge pull request #1342 from dereuromark/master-coding-standards
...
incorrect tab to space - whitespace coding standards
2013-06-09 20:00:46 -07:00
mark_story
d10df32a44
Update version number to 2.3.6
2013-06-09 22:41:41 -04:00
euromark
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02:00
euromark
4518624187
more whitespace coding standard corrections
2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2
coding standards whitespace and single quote
2013-06-09 17:20:08 +02:00
euromark
f6aedea271
coding standards elseif
2013-06-09 17:12:46 +02:00
mark_story
e5b1182a0d
Only delete files that have a matching group + prefix.
...
Fixes #3873
2013-06-08 22:42:41 -04:00
Aymeric Derbois
0cfdb87cdf
Fix a problem of tag values which is not taken into account
...
(when equal to zero) when passing an array to XML object.
2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa
Add missing call to parent::setUp()
2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38
Merge pull request #1336 from djbobke/caketimetest-locale
...
Fix locale for CakeTimeTest when configured different locale in app
2013-06-08 06:45:20 -07:00
Rik van der Heijden
0946a7799a
Fix locale for CakeTimeTest when configured different locale in app
2013-06-08 10:25:28 +02:00
euromark
394bf1054d
remove name attribute where not necessary, clean up doc blocks
2013-06-08 04:29:08 +02:00
Arnold Almeida
dacf7e0ebe
Update FixtureTask.php
...
Using err() does not stop shell output when used in the context of a script.
Also no nice color syntax to indicate that there was an error with one of the fixture generations.
Using error() fixes that.
2013-06-07 14:21:35 +08:00
Jose Lorenzo Rodriguez
f14c55916f
Repeating previous change for SQLite, so it passes on PHP 5.5
2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6
Fixing postgres test for PHP 5.5
2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2
Rewriting assertion to account for the actual case and not breaking in
...
PHP 5.5
2013-06-06 17:45:52 +02:00