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
12712 commits 7 branches 0 tags 44 MiB
Commit graph

2374 commits

Author SHA1 Message Date
mark_story
354716cf60 Fix issues with sparse arrays in ThemeView. 
Fixes #2500
 2012-01-23 20:22:06 -05:00
Kyle Robinson Young
f69edb5c80 Remove incorrect parameter in HtmlHelper::script docblock example 
Fixes #76
 2012-01-23 16:01:38 -08:00
Ceeram
4f1be12046 Merge branch '2.1-appshell' into 2.1 2012-01-23 15:29:03 +01:00
Jose Lorenzo Rodriguez
62b203f54c Update version number to 2.1.0-beta 2012-01-22 21:18:22 -04:30
Graham Weldon
64d4387c82 Added default prefix to cache configurations. 2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
9d0a67ddec Avoiding class name conflicts 2012-01-22 16:46:41 -04:30
José Lorenzo Rodríguez
5cc2860c41 Merge pull request #437 from josegonzalez/2.1-theme-view 
2.1 theme view
 2012-01-22 12:52:00 -08:00
Jose Diaz-Gonzalez
c2519e702d Merging ThemeView and View class 
In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
 2012-01-22 15:45:26 -05:00
Jose Lorenzo Rodriguez
b9ad469a65 Merge remote-tracking branch 'origin/2.0' into 2.1 2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a Set encoding in CSS file. 
Signed-off-by: mark_story <mark@mark-story.com>
 2012-01-22 11:34:16 -05:00
Jose Lorenzo Rodriguez
a1daaf5960 Merge branch '2.1-http' into 2.1 2012-01-21 15:51:34 -04:30
Jose Lorenzo Rodriguez
1884cd1f28 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-21 15:49:25 -04:30
Jose Lorenzo Rodriguez
37314a2188 Logging transaction commands in DboSource, fixes #2457 2012-01-21 15:48:17 -04:30
Jose Lorenzo Rodriguez
6aa08b5f52 Preventing datasource creationa and access on models having $useTable = false; 2012-01-21 14:03:11 -04:30
mark_story
70bb839de9 Add validation guess for not null + text types. 
Fixes #2493
 2012-01-21 13:10:30 -05:00
mark_story
bc689151a4 Add note about PHP's include_path. 
Refs #2497
 2012-01-21 10:23:25 -05:00
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
 2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257 Merge changes from hmic/CakeEmail-2.0 
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.

Fixes #GH433
 2012-01-20 20:17:02 -05:00
Ceeram
d4e2fbf6b8 set correct default validate option, now matches saveAll/saveMany default value, fixes #2492 2012-01-20 11:02:13 +01:00
mark_story
a70c8c7ac3 Merge changes from 1.3 to 2.0 
Merge changes from #GH284 from 1.3 to 2.0.
Model::validate() no longer does queries when its not
necessary.
 2012-01-19 22:50:40 -05:00
mattpotts
1c645152ca added sftp to url() 2012-01-19 22:05:10 -05:00
mark_story
69a69d48a2 Add test for Validation::url() + sftp. 2012-01-19 22:04:10 -05:00
Jose Lorenzo Rodriguez
00a5510b1d Readability changes 2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
5df2a0957f Not sending the response in beforeRender, better let Dispatcher do its work 2012-01-19 22:26:32 -04:30
mark_story
1693478889 Adding test for #GH424 2012-01-19 21:50:51 -05:00
mark_story
ad304e0b43 Reformat long line. 2012-01-19 21:50:51 -05:00
Mark Story
599d8b885c Merge pull request #424 from stefanozoffoli/patch-2 
Prevent blackhole auth error where are present multi fields
 2012-01-19 18:50:39 -08:00
mark_story
eb101b9eb8 Update Model::saveAssociated() documentation 
Fixes #2492
 2012-01-19 21:10:46 -05:00
wnasich
c95ab282dc Test case and Fix for: Number::currency() issue 
Fixes currency() for custom formats and numbers between -1 and 1.

Fixes #2489

Conflicts:

	lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
	lib/Cake/View/Helper/NumberHelper.php
 2012-01-19 21:07:27 -05:00
ADmad
d61b6dc7d3 Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487 2012-01-20 04:05:40 +05:30
Ceeram
2a9e6771c3 allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769 2012-01-19 23:26:43 +01:00
ADmad
2c239cc851 Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487 2012-01-20 03:31:08 +05:30
Stefano Zoffoli
c3b806ce8c Prevent blackhole auth error where are present multi fields 2012-01-19 17:48:39 +01:00
AD7six
b62d9729a9 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-19 10:51:24 +01:00
AD7six
a5240e23ab Merge branch 'feature/set-nest' into 2.1 
Conflicts:
	lib/Cake/Model/Model.php
 2012-01-19 10:51:09 +01:00
Jose Lorenzo Rodriguez
769a5c24e6 Fixing some failing test cases 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
979f7a28b5 Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in 
RequestHandlerComponent
 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
28ee27e2dd Making it possible to cancel the render() process from any beforeRender listener 2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3 Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive 2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450 Fixing typo in docblock 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
a7662eba57 fixing doc comment identation 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dffe84cfbc Implementing RequestHandler::checkNotModified() as a helper for HTTP caching 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e Implementing CakeResponse::notModified() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb Implementing the CakeResponse::etag() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6 Adding CakeResponse::vary() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e Implementing mustRevaidate() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571 Removing Pragma headers, implementing sharedMaxAge in CakeResponse 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
2428e83e3f Adding test case for maxAge() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f Implementing the modified() method in CakeResponse to have an easier way of setting the modification time 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2 Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e Not appending the charset information for content types that are not text/* in CakeResponse 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6 Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130 Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e Adding protocol() method to CakeResponse to be able to change it on the fly 2012-01-19 01:08:43 -04:30
Scott Harwell
e1738c8c4a Added check for NOT in key when array count === 1 to prevent SQL error 2012-01-18 15:04:53 -05:00
AD7six
f1f1ce0db4 allow specifying an explicit root 2012-01-18 13:05:44 +01:00
Cauan Cabral
03bac42366 Change fullPath option to fullBase in HtmlHelper::image for consistency 
Updated test cases for that.
Included doc block about that option.
 2012-01-18 08:32:40 -03:00
mark_story
5e495ad90c Simplify how options are checked. 2012-01-17 21:57:22 -05:00
Mark Story
e080bb27b9 Merge pull request #411 from fitorec/2.0 
Check the logic in the Shell::in($prompt, $options = null, $default = null)
 2012-01-17 18:53:00 -08:00
Mark Story
8608caa8a2 Merge pull request #298 from vitorpc/2.0 
Property 'name' removed of PagesController.
 2012-01-17 18:52:26 -08:00
Cauan Cabral
90426674cb Merge branch 'master' into 2.1 2012-01-17 23:18:54 -03:00
Cauan Cabral
d2315ef35b Fix test for HtmlHelper::link 2012-01-17 23:15:11 -03:00
Cauan Cabral
0c0135ff5e Option to return img src with fullpath address 2012-01-17 22:55:24 -03:00
Majna
d2dd861417 Update doc block for 'keepExisting' HABTM option. 2012-01-17 22:02:30 +01:00
Majna
e947df36a5 Remove unnecessary condition in Model::getID(). 2012-01-17 21:57:40 +01:00
Majna
826374e57c Remove unnecessary param when calling begin, commit and rollback on datasource. 2012-01-17 21:52:22 +01:00
Ceeram
828117583f fix that argument with 0 as value will stop parsing args, tests added 2012-01-17 20:01:40 +01:00
mark_story
c81fe6249d Fix prefix = false in connect() 
Connecting routes with a prefix = false created an un-matchable route.
Ignore falsey prefix values when setting up prefixes.

Fixes #2479
 2012-01-16 21:30:26 -05:00
Scott Harwell
153b9f9ee2 Updated to use camelize rather than classify 2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667 Added check for duplicate methods to prevent fatal php error 2012-01-16 14:45:12 -05:00
Renan Gonçalves
3a3d89d6d1 Updating test to reflect last changes made by pull #413. 2012-01-16 16:51:49 +01:00
Bob Fanger
5cb974ee70 Fixes the MethodNotAllowed when deleting a model from an scaffolding view.ctp page 2012-01-16 16:21:06 +01:00
Fitorec
ddbaa66997 Reviewing the logic in the Shell::in($prompt, $options = null, $default = null) 2012-01-15 21:16:45 -06:00
Jose Diaz-Gonzalez
adde2a9af5 Fixed broken Controller::setAction() testcase 2012-01-15 15:16:49 -05:00
Jose Diaz-Gonzalez
ad2472aab0 Testcase for Controller::setAction() 2012-01-15 15:00:30 -05:00
Jose Diaz-Gonzalez
6046b8d013 Properly set the current action on CakeRequest when invoking Controller::setAction() 2012-01-15 14:32:09 -05:00
ADmad
f11389fd10 Merge pull request #404 from tigrang/router-defaultRouteClass-fix 
Router::defaultRouteClass() now returns currently set route class if no param is passed. Also added Router::_validateRouteClass() for route class validation.
 2012-01-15 00:44:43 -08:00
Jose Lorenzo Rodriguez
ef568b1159 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-14 23:31:56 -04:30
Jose Lorenzo Rodriguez
81b41aa561 Optimizing Configure::delete(), you can now delete arbitrarily nested keys 2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66 Optimizing Configure::read(), now it is possible to read arbitrarily nested keys 2012-01-14 23:22:08 -04:30
Tigran Gabrielyan
f5b62eb84c Fixed typo in DocBlock 
Router::defaultRouteClass will return the current routeClass if null is
passed
Router::connect and Router::defaultRouteClass both validate the routeClass
now using Router::_validateRouteClass
 2012-01-14 18:45:51 -08:00
AD7six
67f4fa0f20 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-15 01:03:48 +01:00
AD7six
22f844c48f prevent block="css" when using inline=false css 2012-01-15 01:03:17 +01:00
mark_story
c89c49c310 Enhance HtmlHelper::getCrumbs() $startText param 
It now accepts an array which gives more control and flexibilibity
over the first breadcrumb link.

Fixes #2475
 2012-01-14 13:14:26 -05:00
Ceeram
7badb1d252 fix magic __isset() 2012-01-14 12:42:10 -05:00
Jose Lorenzo Rodriguez
3a48f64370 Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys 2012-01-14 02:15:31 -04:30
mark_story
b14072aa6f Add Router::defaultRouteClass() 
Apply patch from 'Tigran Gabrielyan'.
Allows you to set the default route class used for all future
routes.

Fixes #2435
 2012-01-12 22:19:55 -05:00
Mark Story
533feea2b1 Merge pull request #403 from rintaun/patch-2 
$action in AclShell::_getParams() should default to '*', not NULL
 2012-01-12 19:08:42 -08:00
Mark Story
b76f8f8832 Merge pull request #260 from tPl0ch/2.1-authenticate 
Added 'recursive' settings option to BaseAuthenticate and BasicAuthenticate
 2012-01-12 18:53:19 -08:00
mark_story
b6040aec5a Update UpgradeShell for App classes. 
Correctly move AppController and AppModel.
Fixes #2472
 2012-01-12 21:37:34 -05:00
Jose Lorenzo Rodriguez
2c5cb1157f Merge branch '2.1-alltests' into 2.1 2012-01-12 20:13:58 -04:30
Jose Lorenzo Rodriguez
e25867da79 Catching any possible exception in DatabaseSession destructor, using exceptions in destructors is a bad idea in PHP 2012-01-12 20:12:38 -04:30
Jose Lorenzo Rodriguez
205064f11e Merge remote-tracking branch 'origin/2.1' into 2.1 2012-01-12 19:14:50 -04:30
Jose Lorenzo Rodriguez
e6e14a7ff9 Fixing php 5.2 specific problem, closes #2468 2012-01-12 19:13:56 -04:30
Ceeram
eaf6f0e2c1 add missing App::uses() 2012-01-12 18:01:27 +01:00
Ceeram
9c652e6573 add missing tests 2012-01-12 13:06:24 +01:00
Ceeram
9f40e6de79 move AppShell to app/Console/Command directory 2012-01-12 11:55:10 +01:00
AD7six
7414d0f77b rename set::getValue to set::get - and make it public 2012-01-12 09:45:28 +01:00
Matthew Lanigan
0e607bf880 $action in AclShell::_getParams() defaults to '*', not NULL 2012-01-11 21:59:58 -05:00
mark_story
97ce118294 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
 2012-01-11 20:59:31 -05:00
Jose Lorenzo Rodriguez
1a741b853b Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-11 21:26:12 -04:30
Jose Lorenzo Rodriguez
c53f0e6877 Explicitly casting to string a variable that could in times be either string or integer 2012-01-11 21:25:22 -04:30
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages. 
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
 2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41 Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries. 
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
 2012-01-11 20:30:49 -05:00
mark_story
0f8e1500de Ensure helpers are loaded in data views. 
Both XmlView and JsonView should load helpers when
they use view files.

Fixes #2465
 2012-01-11 20:21:56 -05:00
Victor Yap
cf8c1cd93b Return length 36 for uuid columns in Postgres.describe() 
When describing a Postgres native "uuid" column, the length 36 should be
returned so that Model.save() will be able to correctly set $isUUID as
"true" on that column.

Fixes #2467
 2012-01-11 17:27:39 -05:00
mark_story
32cb416ad7 Replace smart quotes with ASCII equivalents. 
Fixes #2466
 2012-01-11 13:38:50 -05:00
mark_story
aeda986745 Add additional empty() for tablePrefix. 
Fixes compatibility issues with plugins that worked correctly in
previous point releases.

Fixes #2462
 2012-01-10 21:01:03 -05:00
mark_story
7877e7f997 Make allow(null) and deny(null) consistent with no args. 
No arguments and a single null should be handled the same.

Fixes #2461
 2012-01-10 20:32:12 -05:00
mark_story
a8bc916104 Move check out of the loop, and allow nulls. 
Refs #2341
 2012-01-10 20:15:59 -05:00
AD7six
941d503726 documentation clarification 2012-01-10 10:52:07 +01:00
AD7six
a62c5350b3 whitespace 2012-01-10 10:51:06 +01:00
AD7six
d5fdf45e51 add a test for what happens when you nest on a field that doesn't exist 2012-01-10 10:49:17 +01:00
AD7six
3b1dd82603 add tests for set nest method 2012-01-10 10:18:59 +01:00
AD7six
d534013570 reduce code repetition 2012-01-10 09:47:51 +01:00
mark_story
d238d8c0bb Fix incorrect __isset(). 
There was a missing $ before name.  Fixes issues
with dynamic properties not being handled correctly.

Fixes #2450
 2012-01-09 21:47:57 -05:00
mark_story
dbea15650b Add iPad to the list of mobile clients. 
Fixes #2452
 2012-01-09 21:33:13 -05:00
AD7six
5608d63541 allow set nest to work with any-d arrays 
not just model-formatted arrays
 2012-01-10 01:24:20 +01:00
AD7six
442d889f99 move the paths used into options 2012-01-10 00:48:36 +01:00
AD7six
7b640b8123 move find threaded logic to the set class 2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0 Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.

Conflicts:

	lib/Cake/Utility/ClassRegistry.php
 2012-01-09 23:42:09 +01:00
AD7six
336c750b7e Ensure the class has a constructor 
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
 2012-01-09 23:38:32 +01:00
ADmad
0be71a08d6 Adding / updating I18n class test cases. 2012-01-10 01:46:19 +05:30
ADmad
30522d0219 Adding $language parameter to I18n::translate() 2012-01-10 00:51:48 +05:30
ADmad
08825e54b7 Replacing hardcoded default domain with static property I18n::$defaultDomain 2012-01-10 00:51:48 +05:30
ADmad
1f246d61ca Refactoring I18n class to expose public methods to read .po, .mo and locale definition files. 2012-01-10 00:51:47 +05:30
mark_story
1ffde95239 Update version number to 2.1.0-alpha 2012-01-08 22:23:56 -05:00
mark_story
1bc4562f3a Fix failing test in App. 2012-01-08 22:14:32 -05:00
mark_story
0e56d742b8 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/basics.php
 2012-01-08 21:59:18 -05:00
mark_story
f4c27e04bc Fix errors generated when option['order'] is undefined. 
Fixes #2447
 2012-01-08 21:55:51 -05:00
mark_story
3c48552f81 Fix error with more case-sensitive databases. 2012-01-08 21:40:12 -05:00
mark_story
c548b6b88a Fix issue with find(count) and translated conditions. 
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
 2012-01-08 20:40:25 -05:00
Jose Lorenzo Rodriguez
c029316a62 Merge branch '2.1-hiphop' into 2.1 2012-01-08 20:12:40 -04:30
Jose Lorenzo Rodriguez
850dbb9453 More explicit fetch mode in Mysql datasource 2012-01-08 18:46:42 -04:30
mark_story
9a67a70703 Fix failing test. 2012-01-07 20:24:33 -05:00
mark_story
79564fb7d4 Remove incorrect constant. 2012-01-07 20:10:14 -05:00
mark_story
72b9eb540e Update core cake.php to match other versions. 
This makes the pear package install play nice as well.
 2012-01-07 20:05:11 -05:00
mark_story
da5d4bb816 Revert version number change. 
Add trim to fix cli display.
 2012-01-07 20:05:11 -05:00
mark_story
6361500124 Update version number to 2.1.0-alpha 2012-01-07 20:05:10 -05:00
Jose Lorenzo Rodriguez
8b7f069415 Wrapping highlight_string into a helper function as hphp does not implemnet this function 2012-01-07 19:10:44 -04:30
Jose Lorenzo Rodriguez
44dd25010d Adding a replacement for zend_thread_id() to use within hiphop 2012-01-07 18:41:16 -04:30
Jose Lorenzo Rodriguez
67d18b0c59 Making sure the Validation class exists before checking methods on it 2012-01-07 18:33:24 -04:30
Jose Lorenzo Rodriguez
7b586369e0 Initializing CakeSession class only when required, mixing procedural code with class definitions is not good 2012-01-07 18:31:50 -04:30
Jose Lorenzo Rodriguez
399c293b77 Extracting the CakeSessionHandlerInterface into its own file 2012-01-07 18:20:16 -04:30
Jose Lorenzo Rodriguez
e5c312f4b5 Using an explicit fetch mode in all calls to PDOStatement::fetch, this also reduces the memory usage 2012-01-07 18:06:02 -04:30
Jose Lorenzo Rodriguez
fa99b58622 Ensuring the javascript provider class is loaded before checking method on it 2012-01-07 18:03:22 -04:30
mark_story
beced84d2d Fix illegal offset caused by TranslateBehavior. 
If you load TranslateBehavior at runtime in a disabled state, the enabled
flag would be interpreted as an association and cause errors.

Fixes #2443
 2012-01-07 11:58:35 -05:00
mark_story
87924414fc Update Configure::load() to use Set::merge() 
This fixes some of the awkward behavior that using
array_merge_recursive() could create.

Fixes #2441
 2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
1991430584 Removing test that does not relate anymore to SqlServer datasource 2012-01-07 02:17:27 -04:30
Jose Lorenzo Rodriguez
0c6271dd5d Fixing a few SqlServer failing tests 2012-01-07 02:14:07 -04:30
Jose Lorenzo Rodriguez
abb370fe3f Fixing windows failing test case on the debug function 2012-01-07 01:39:40 -04:30
Jose Lorenzo Rodriguez
ba097d404f Explicitly using a fetch mode in SQLServer, not doing it causes serious memory leaks 2012-01-07 01:04:02 -04:30
Jose Lorenzo Rodriguez
cd562f52ba Fixing a couple failing tests on windows using sqlserver 2012-01-07 00:37:50 -04:30
mark_story
de7921a5d4 Merge branch '2.0' into 2.1 2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f Add missing else for non SQLServer db's. 2012-01-06 23:06:12 -05:00
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
f23226b937 Fix failing test on windows 
File permissions do not work the same on windows, skip the test.
 2012-01-06 23:01:59 -05:00
mark_story
d69c3f3db6 Fix failing tests with SQLServer. 2012-01-06 22:53:39 -05:00
mark_story
f22c80e9ec Add skip for test that fails on SQLServer. 
SQLServer doesn't support LIMIT, skip the test as its tested
in Jenkins all the time.
 2012-01-06 22:21:54 -05:00
mark_story
e649a0516e Fix singularization of 'foes' 
Fixes #2424
 2012-01-05 21:22:40 -05:00
Jose Lorenzo Rodriguez
7c0297a92c Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733 Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales' 2012-01-05 19:56:01 -04:30
Majna
8ad989cabe Fix dispatching event when event key name is used. 2012-01-05 18:31:00 +01:00
Simon Males
adc6846145 schema update fails with -f flag, although it's supported. 2012-01-05 16:54:02 +11:00
mark_story
95ec741b6c Changing SCRIPT_NAME to PHP_SELF 
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.

Fixes #2437
Fixes #2334
Fixes #2268
 2012-01-04 21:10:29 -05:00
José Lorenzo Rodríguez
f9c8d0cbf9 Merge pull request #394 from majna/2.0-sess-doc 
Remove unused property CakeSession::$security.
 2012-01-04 16:20:24 -08:00
Majna
75b4e7d550 Remove unused property CakeSession::$security. 2012-01-04 22:09:40 +01:00
José Lorenzo Rodríguez
3589eaebcf Merge pull request #393 from majna/2.0-sess-doc 
Fix incorrect doc block in CakeSession.
 2012-01-04 12:49:36 -08:00
Majna
ba02cf7a9a Fix incorrect doc block in CakeSession. 2012-01-04 21:40:14 +01:00
mark_story
9562638610 Merge branch '2.0' into 2.1 2012-01-04 07:39:35 -05:00
mark_story
3e1c567f08 Remove duplicate methods. 
Fix regression where #1345 was re-introduced.
Fixes #2434
 2012-01-03 21:11:45 -05:00
mark_story
c43b099894 Fix null bytea columns. 
Apply patch from 'opiazer'  Fixes #2432
 2012-01-03 20:51:56 -05:00
mark_story
101148c10f Return 0 if there is no result. 
The documented return is an integer.  Stick to that.
Fixes #2430
 2012-01-02 20:18:01 -05:00
mark_story
b4faa00703 Adding error to find(threaded). 
When the model has no parent_id trigger a warning about the impending
failure and return an empty result.

Fixes #2341
 2012-01-02 13:46:35 -05:00
Mark Story
81d7ef46c5 Merge pull request #392 from vesln/resource-map 
Resource map
 2012-01-02 05:23:30 -08:00
Veselin Todorov
3eea2e2073 Adding resourceMap accessor test 2012-01-02 13:53:32 +02:00
Veselin Todorov
8864805277 Adding resourceMap accessor 2012-01-02 13:53:21 +02:00
mark_story
997aa8a37b I'm an idiot. Fix the parse error. 2012-01-01 21:29:13 -05:00
mark_story
83987bee17 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Network/CakeRequest.php
 2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3 Add Windows Phone OS to mobile browser list. 
Fixes #2428
 2012-01-01 12:57:35 -05:00
Kyle Robinson Young
8b9770d34d Fix types in docblocks in App class 2011-12-31 14:51:24 -08:00
mark_story
c3e9a931d6 Should have been association name, not field name. 2011-12-30 20:54:26 -05:00
mark_story
b5f918765e Adding docs + exceptions for name translation. 
Closes #2367
 2011-12-30 20:39:04 -05:00
mark_story
6c902a19b3 Fix issue with rendering elements inside blocks. 
Fixes exceptions being raised when you tried to render
elements inside blocks.  Instead compare the number of open blocks.
This should not change before/after rendering a view.
 2011-12-30 14:56:31 -05:00
mark_story
3478f8a627 Merge branch '2.0' into 2.1 2011-12-30 10:19:51 -05:00
Mark Story
a4e3790196 Merge pull request #387 from shama/patch-text-truncate 
Prevent TextHelper::truncate() from breaking HTML
 2011-12-30 07:15:35 -08:00
mark_story
ed43c685b9 Fix string offset error in PHP 5.4 2011-12-29 22:10:12 -05:00
mark_story
ff29b194ed Fix version config. 2011-12-29 20:12:45 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-12-29 20:03:42 -05:00
tigrang
015f9957be Changed order of controller var merging 
From AppController -> PluginAppController to
PluginAppConroller -> AppController

Fixes #2420

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-29 20:02:00 -05:00
mark_story
9cdf8042bf Fix issue with scripts_for_layout compatibility. 2011-12-29 11:58:05 -05:00
mark_story
5936fa5930 Fix strict errors. 2011-12-29 11:10:25 -05:00
Ceeram
929a40364f adding magic method__isset() for overloaded properties 2011-12-29 16:22:08 +01:00
Rachman Chavik
1d333fd8b7 fullTableName needs to check for empty schemaName 2011-12-29 19:18:37 +07:00
Rachman Chavik
b1aae5b5ab add fullTableName tests with empty schemaName 2011-12-29 19:17:06 +07:00
mark_story
339259c841 Update version to 2.0.5 2011-12-28 22:00:12 -05:00
Jose Lorenzo Rodriguez
a47c8160dd Merge remote-tracking branch 'origin/2.1' into 2.1 2011-12-28 19:29:48 -04:30
Mark Story
83b28c42cf Fix failing tests and missing boundary markers. 
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
 2011-12-27 23:38:21 -05:00
Mark Story
f366a9ff83 Add test for inline attachments. 2011-12-27 22:51:47 -05:00