Commit graph

38 commits

Author SHA1 Message Date
gwoo
46d9b86b76 adding fix for #1465 and #1469
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3581 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 16:44:02 +00:00
gwoo
ab56074c40 adding changes to bake.php in 1.2.x.x
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3496 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-15 20:19:03 +00:00
phpnut
eb202d44f9 Merging fixes into trunk:
Revision: [3440]
Adding note to api doc of the redirect function (#1358)

Revision: [3439]
Revoking previous change, fixing bug in api doc

Revision: [3432]
added fix for #1352

Revision: [3430]
Adding nl2br in Sanitize::html

Revision: [3420]
Typo fixed

Revision: [3383]
Refactoring last commit for admin check

Revision: [3382]
Adding fix for admin being searched in entire string

Revision: [3379]
Fixing errors when CSS not showing after recent fixes to error class

Revision: [3376]
Backporting string-escaping fix from 1.2 for Ticket #

Revision: [3373]
Adding Windows-specific port delimiter for connecting to SQL Server (Ticket #1261).

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3454 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-07 19:23:27 +00:00
dho
1cb3a46703 Typo fixed
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3420 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:27:03 +00:00
phpnut
303c366a2e Merging fixes into branched code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3312 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 05:58:31 +00:00
phpnut
5549ddfd75 Replacing labelTag with new label().
Merged changes to bake.php


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3305 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 16:52:36 +00:00
phpnut
aee87dcdda Merging changes to bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3297 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 19:06:21 +00:00
phpnut
e2937c405e Merging changes to bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3296 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 18:59:52 +00:00
dho
67d75ba18b Adding ; after endifs (ticket #1195)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3278 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 06:09:11 +00:00
dho
49ca6981ca Applying patch to add docblocks (ticket #1171)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3273 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-18 11:11:44 +00:00
phpnut
6d71310f00 Beginning to port fixes to 1.2.x.x code from 1.1.x.x
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3268 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-15 03:36:53 +00:00
phpnut
e9c3f1ad81 Added fix for Ticket #1082
Fixed lowercased model name being generated in bake.php

Removed $this->viewPath from generated controller classes

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3215 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 17:39:51 +00:00
phpnut
25fc73660c Fixing Fatal error: Call to undefined method HtmlHelper::submitTag()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3210 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 01:37:12 +00:00
phpnut
a24b5a32d8 Removing useless echo the baked view.thtml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3184 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-25 19:16:21 +00:00
dho
be03e8150c Adding missing semicolon which is shown as syntax error in PHPEclipse
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3156 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-21 07:58:54 +00:00
dho
dfa6e140fa Added missing word
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3151 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-20 12:24:48 +00:00
phpnut
b242f56655 Adding fix for Ticket #1036.
This corrects: "No such file" error with bake.php when choosing to 
include basic class methods message


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3143 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 20:02:36 +00:00
dho
6cca0d00ea Merging changes on bake.php from 1.1.x.x branch [3138]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3139 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 15:00:17 +00:00
dho
c477ab64c6 consistent use of "Bake" in help text
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3137 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 07:23:27 +00:00
phpnut
a0743d40e7 Corrected bad char in [3134]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3135 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:47:08 +00:00
phpnut
e7b26eed83 Added fix for Ticket #1019.
bake.php on windows adding slash before filepath when creating unit test files

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3134 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:44:18 +00:00
phpnut
9d19dee879 Renaming branched version directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.1.x.x@3085 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 18:02:37 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00
phpnut
5e268e0805 Merging fixes into 1.x.x.x branched code:
Revision: [2802]




git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
f5a4a58758 Renaming directory for 1.x.x.x code base
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2771 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-07 03:35:58 +00:00
phpnut
e41214da87 Merging fixes into 1.x.x.x branched code:
Revision: [2706]
Adding check for selecting insert id's

Revision: [2701]
Adding fix for Ticket #727

Revision: [2700]
Added patch from Ticket #730

Revision: [2698]
Added fix for Ticket #732

Revision: [2696]
More dbo_source::order() fixes

Revision: [2695]
Adding fix for order(), and results checking in __filterResults()

git-svn-id: https://svn.cakephp.org/repo/branches/1.0.0.2685@2727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-04 00:35:48 +00:00
phpnut
4a8c03ef1c Merging fixes into the trunk.
Revision: [2618]
Adding fix for Ticket #609

Revision: [2617]
Added fix for Ticket #684

Revision: [2616]
Adding patch from Ticket #649

Revision: [2615]
Adding fix for Ticket #608

Revision: [2614]
Additional fix for Ticket #584

Revision: [2613]
Adding fix for Ticket #584

Revision: [2612]
Added fix for undefined index notices

Revision: [2609]
Adding fix for Ticket #658

Revision: [2608]
Adding fix for Ticket #635, and code formatting fixes in FormHelper

Revision: [2607]
Adding fix for Ticket #636

Revision: [2606]
Adding fix to allow associations to be defined through non-associative arrays

Revision: [2605]
Adding fix for Ticket #672

Revision: [2604]
Adding fix for Ticket #708

Revision: [2603]
Adding fix for Ticket #687

Revision: [2602]
Refactoring database drivers, and adding fix for Ticket #398

Revision: [2601]
Merging change from model_php5.php

Revision: [2600]
Adding ODBC driver

Revision: [2599]
Adding fix for Ticket #702

Revision: [2598]
Adding fix for Ticket #699

Revision: [2597]
Fixing an issue in Model::set(), and moving limit() to DboSource

Revision: [2595]
Fixing unit test download URL in Bake

Revision: [2594]
Adding fix for Ticket #698

Revision: [2593]
Adding fox for Ticket #231

Revision: [2592]
Adding fix for Ticket #630, and updating MS SQL driver docstring

Revision: [2577]
Adding $alias property to enable future Oracle support

Revision: [2568]
Merging changes to bake from old sandboxes

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2620 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-27 10:04:08 +00:00
phpnut
8dccd44856 Merging fixes to trunk:
Revision: [2559]
Adding fix for Ticket #666

Revision: [2534]
Adding fix for Ticket #683

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2560 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 21:22:56 +00:00
phpnut
4babd8b9c2 Merging changes to model_php4.php
Merging changes to bake.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2530 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:38:16 +00:00
phpnut
fb46bcceef Merging fixes and enhancements into trunk.
Revision: [2316]
Added fix for message:  Warning: array_diff(): Argument #2 is not an array in Controller::__construct()

Revision: [2315]
Adding fix for Ticket #517

Revision: [2314]
Corrected scaffold throwing errors when irregular words are used for model/table names

Revision: [2313]
Added patch from Ticket #495.
Added missing ?> bracket at end of file

Revision: [2312]
Corrected model names being set to lower case, When matched to an irregular word in Inflector methods.
Added custom inflections.php file to allow application to have custom inflection rules.
Correct variable in View::renderCache(). error thrown if time class was used $time variable changed to $timeStart.

Revision: [2311]
Corrected $db placed in wrong section of the method

Revision: [2310]
Removing the db attribute from the model, This will help better with persistent objects

Revision: [2309]
Adding fix for Ticket #490

Revision: [2308]
Update to previous commit

Revision: [2307]
Removing references to Model->db. DataBase connections are now singleton-only.

Revision: [2306]
Refactoring getDataSource() into loadDataSource() and enumConnectionObjects()

Revision: [2305]
Reverting changes to this file

Revision: [2304]
Fixing Ticket #496, getColumnType, and docstrings

Revision: [2303]
Adding fix for Ticket #510


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-15 20:45:59 +00:00
phpnut
a75e08976f Merging fixes and enhancements into trunk
Revision: [2025]
A little more work on plugin to set some default routing.

Revision: [2024]
Changed DboSource::field() so the name() is not called for some field variables.

Revision: [2023]
Changes made in [2022] should only check if the $conditions is not empty.

Revision: [2022]
Changed DboSource::conditions() so it will add the "ticks" needed around the Model.field names.
The Model.field name conventions must be used for this to work.

Revision: [2021]
Adding fix for Ticket #405

Revision: [2020]
Added fix for Ticket #403

Revision: [2019]
Added patch from Ticket #404.
Fixing formatting of files.

Revision: [2018]
Fixing formatting of files 

Revision: [2017]
Fixed bad search and replace

Revision: [2016]
Fixing formatting of files 

Revision: [2015]
Replaced all 3 space indents with 4 space indents

Revision: [2014]
Updating variables to use the naming proper conventions

Revision: [2013]
Added patch from Ticket #406

Revision: [2012]
Adding fix for Ticket #407.
Fix variables that where not formatted per the coding conventions

Revision: [2011]
Adding patch from Ticket #401

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2026 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-18 23:42:21 +00:00
phpnut
73830ec0dc Merging fixes and enhancements into trunk
Revision: [1841]
Merging changes made in model_php5.php to model_php4.php

Revision: [1840]
Adding fix for PHP 5 when using mysql_connect setting.
Commented out the call to Dbo*::disconnect(). This was closing connections early.
Adding fixe for Ticket #302.
Adding Enhancement for Ticket #300.
Adding fix for Ticket #299
Adding Enhancement for Ticket #298
Adding fix for Ticket #297
Adding Enhancement/Patch from Ticket #296

Revision: [1838]
working on deeper recursive joins

Revision: [1837]
Updating copyright information in all files

Revision: [1836]
Adding fix when setting a field value to 0.
Before it would set this to NULL, which was not expected result.  


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1842 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 07:46:14 +00:00
phpnut
fb96b06394 Merging fixes to trunk
Revision: [1796]
Adding missing layout error messages.
Changed more errors in View class to use the ErrorHandler class

Revision: [1795]
Added the missing error messages I found after RC 1 was built.
Corrected errors in the View class when helpers where not found.
Added error views for missing component classes and files.
Updated views for missing view classes and files

Revision: [1794]
Adding fix for Ticket #273

Revision: [1793]
Correcting loading order of required files in bake.php

Revision: [1792]
Added fix for Ticket #271

Revision: [1791]
Fix for Ticket #268 and Ticket #272

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1797 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-13 23:53:23 +00:00
phpnut
134744b5d6 Merging:
[1613]
Fixing Bake (Ticket #5)

[1612]
Adding new file header

[1611]
Starting to fix Bake (Ticket #5)

[1610]
Adding patch for Ticket #63

[1609]
Fixing ticket #13

[1608]
Fix so only sub classes that have a __destruct() implemented will have it registered

[1607]
Fixing ticket #130

[1606]
Fix for Ticket #190

[1605]
Fixing ticket #136

[1604]
Fixed would throw error if a action was camelCased in the url or in requestAction()

[1603]
fixed a few typos in home view

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1614 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-24 07:56:48 +00:00
phpnut
c7d02c8068 Merging changes to the trunk.
Updated headers.
beginning to clean up files that are not used in this version of Cake

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1593 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-23 21:57:26 +00:00
phpnut
6baaa1120f [1125]
Adding empty directories where overrides for the core views can be placed.
Adding an empty directory for elements 

[1127]
Adding directory to hold core inflection files 

[1128]
More work on the new inflector.
This still is not completed but should be soon

[1130]
Documentation strings, du jour.

[1131]
Docstringed and ready. Inflector lacks one docstring. It is noted in its todo

[1132]
Incomplete documentation, and some corrections to previous documentation.
Gwoo noted that there'll be more changes in the Helpers soon, so I back off here.

[1134]
Adding before filters back to code.
Commented out a regex in Inflector::pluralize(); that os causing problems.
Removed a duplicate define in index.php.
Removed the bare array being set automatically when using requestAction().
With this change you must use requestAction(); like this.
$object->requestAction('/bare/controller/action/param');
Added GOTCHAS file with links to problems people may have with CakePHP.
Some more work done on new Inflector. 

[1135]
Added a check when trying to access a private method of a controller.
This will now display an error page informing user that this is not allowed. 

[1137]
Fixed a few undefined variable errors in the code
Corrected problem with double layout display when an error is returned and caught.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1138 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-10-18 22:27:39 +00:00
phpnut
d62b9ec65e Merging from sandboxes
[1079]
Merged [1005] committed by nate but not added to core prior to release.
Merged [1078] prior to modifying all developers sandboxes.

[1081]
adding view and template directories

[1082]
adding base files for view generator 

[1083]
correcting all package and sub package tags for in doc blocks.
Making sure every file in the core has doc block in them

[1084]
renaming working copy of latest release

[1093]
Added fix for associations using underscores if var $useTable is set in the associated models.
This closes ticket #11.

[1094]
Fix for Ticket #24.
The problem was tracked to a variable in View::_render();
$loadedHelpers was being assigned a reference when it when it should not have been.

[1096]
Initial work on controller components needs testing.
Also added a work around for the basics.php uses().
Using the define DS where the files from the original version are now located in deeper libs directories.

[1097]
committing a few typos in the code I added

[1098]
reformatting code in component.php

[1104]
changed the test route and corrected a regex in inflector.

[1111]
removing the contructor from dispatcher, it is not needed

[1112]
Changes made for errors when a file is not present in webroot.
Fixed the regex used in Router::parse().
Change the error layout template.

[1113]
Changes to Folder class to allow setting the permissions mode when constructing.
This class needs to be refactored and move everything that is in the contructor out.
The constructor should set the vars for use in other Folder::"methods"().
Will work on this at a later time.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1114 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-10-09 01:56:21 +00:00
phpnut
d44a364285 merging all changes done in sandbox for next release into the trunk
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1057 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-10-03 04:48:00 +00:00
Renamed from scripts/bake.php (Browse further)