Commit graph

5739 commits

Author SHA1 Message Date
mark_story
19f008b1a4 Fixing broken tests in HelperCollectionTest
Moving unload into ObjectCollection as its common between 2 child classes, and possibly a 3rd.
2010-08-10 23:18:40 -04:00
mark_story
426d35d66e Fixing string that got changed in a rebase. 2010-08-10 23:18:40 -04:00
mark_story
0f5e881f26 Fixing typo. 2010-08-10 23:18:40 -04:00
mark_story
7b4916e16a Updating AclComponent to new Component API. 2010-08-10 23:18:40 -04:00
mark_story
a4e2f7c55f Updating intialiize() callbacks. Moving $this->_set() int Component::__construct as all the core components did it. Updating constructors and including parent calls. 2010-08-10 23:18:40 -04:00
mark_story
052c81774c Removing some code duplication. 2010-08-10 23:18:40 -04:00
mark_story
22fbc24560 Adding 'collectReturn' option to ObjectCollection::trigger. lets a callback collect the return of each object and return that.
Adding tests.
2010-08-10 23:18:40 -04:00
mark_story
fac97738ce Making Controller use ComponentCollection. 2010-08-10 23:18:39 -04:00
mark_story
256532b8e4 Updating Components to use Component as the parent class. 2010-08-10 23:18:39 -04:00
mark_story
bf75ab5737 Starting to update Component into a base class instead of a loader class. 2010-08-10 23:18:39 -04:00
mark_story
3666643b84 Adding ComponentCollection and a test case. 2010-08-10 23:18:39 -04:00
mark_story
337ab19145 Updating ObjectCollection::trigger() so it doesn't call __get().
Updating HelperCollection test which was passing by coincidence.
2010-08-10 23:18:39 -04:00
mark_story
62019888ba Changing file headers to reflect accurate licences and versions created. 2010-08-10 23:18:39 -04:00
mark_story
c44c276fa3 Removing ModelBehavior::dispatchMethod(), replacing with call_user_func_array() as its faster and the php4 workaround is no longer needed. 2010-08-10 23:18:39 -04:00
mark_story
409b12954b Simplifying logic and data structures used to store enabled-ness of objects in an object collection. 2010-08-10 23:18:39 -04:00
mark_story
b2250852e4 Moving BehaviorCollection into its own file.
Changing how behaviors are stored in the collection object.  Makes it work the same as HelperCollection.
2010-08-10 23:18:39 -04:00
mark_story
fcbfb556c5 Moving loaded helpers into a protected array.
Adding magic methods to access the object array.
2010-08-10 23:18:39 -04:00
mark_story
c78e869be6 Removing PHP4 workarounds in BehaviorCollection.
Making BehaviorCollection throw exceptions instead of use cakeError.
2010-08-10 23:18:39 -04:00
mark_story
d048813af8 Adding in property copying until this branch gets merged with 2.0-request. 2010-08-10 23:18:39 -04:00
mark_story
6a88452072 Updating TextHelper to not use create_function(). The create_function calls leaked memory and didn't work with the new helper constructors. 2010-08-10 23:18:38 -04:00
mark_story
4672cee5d3 Removing dispatchMethod from JsHelper, its not really that useful, and is good at hiding bugs in mock tests.
Updating test cases.
2010-08-10 23:18:38 -04:00
mark_story
0e933e8893 Updating most helper test cases to use View in their constructors. 2010-08-10 23:18:38 -04:00
mark_story
68ff2e5ce5 Adding additional tests for Helper lazy loading. 2010-08-10 23:18:38 -04:00
mark_story
fc3379767d Moving methods around. ObjectCollection now normalizes helpers arrays. Plugin helpers now lazy load.
Tests updated.
2010-08-10 23:18:38 -04:00
mark_story
98982a6f7a First attempt at lazy loading helpers done. Plugin support not complete. 2010-08-10 23:18:38 -04:00
mark_story
ab815a53ba Helper test case is passing again. 2010-08-10 23:18:37 -04:00
mark_story
087ccabffe Starting to modify Helper constructors. 2010-08-10 23:18:37 -04:00
mark_story
1d983e1cd4 Making MissingView and MissingLayout cake errors into exceptions. 2010-08-10 23:18:37 -04:00
mark_story
a23207791a Modifying View to accept HelperCollection. Removing methods that are no longer needed. 2010-08-10 23:18:37 -04:00
mark_story
f8ecb10407 Adding stub callbacks so errors aren't generated. 2010-08-10 23:18:37 -04:00
mark_story
c15d228515 Initial integration of HelperCollection into View. 2010-08-10 23:18:37 -04:00
mark_story
16d5b2655c Adding a way to load helpers in a disabled state. Updating tests and subclasses. 2010-08-10 23:18:37 -04:00
mark_story
d0de468ce0 Removing options that were not used in the generic application. 2010-08-10 23:18:37 -04:00
mark_story
aa61a251dc Deprecating BehaviorCollection::attach() and BehaviorCollection::detach(). load() and unload() are more generic and make sense in other contexts.
Adding base trigger implementation.
Adding tests for helper triggering.
2010-08-10 23:18:37 -04:00
mark_story
9fd881cb00 Moving methods down and adding some tests. 2010-08-10 23:18:36 -04:00
mark_story
6db3dbc680 Starting to create HelperCollection which will be responsible for loading and constructing helpers.
Making an abstract class that will be the base of all object collections.
Adding test cases.
2010-08-10 23:18:36 -04:00
mark_story
da9c0da626 Changing sql_dump element so it only shows if there is no $logs variable set in the view. Overwriting it could adversely effect helper references. Fixes #998 2010-08-10 23:09:27 -04:00
mark_story
1371cefc3d Applying patch from 'thatcode' to fix an issue where FormHelper::datetime() would not use 'default' or 'value' keys like other inputs would. This corrects an unintentional inconsistency in the methods. Test cases added. Fixes #988 2010-08-09 23:49:18 -04:00
mark_story
29ddffa2d3 Fixing regression in DboMysqlBase where describe() was no longer pulling out fieldParameters. A test case has been added to catch any future regressions. Fixes #991 2010-08-09 23:25:32 -04:00
mark_story
ccfb1d179a Expanding test and fixing issue where the return of Folder::create() would be incorrect even though the directory was properly created. Fixes #996 2010-08-09 22:56:41 -04:00
mark_story
d6e3c318cd Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-08-04 23:59:17 -04:00
mark_story
a04fe5f81d Making Router::reverse() strip out additional framework internal parameters that are specific to requestAction. Refs #977 2010-08-04 23:35:49 -04:00
xbuzz
f2f2987743 Fixed 'convertEntities' to links in RSS. Fixes #959 2010-08-04 22:03:44 -03:00
Dirk Brünsicke
712ca6d5b5 Fixing bug in String::insert that produces unexpected results with
multiple keys that start with the same substring. Fixes #984

Signed-off-by: mark_story <mark@mark-story.com>
2010-08-03 22:38:45 -04:00
José Lorenzo Rodríguez
7e1426e743 Fixing doc block 2010-08-02 19:25:04 -04:30
José Lorenzo Rodríguez
e7c7008781 Changing behavior of RequestHandlerComponent::responseType(), it will return the current content type set int the response object
It will not return null as default as it did prior 2.0
2010-08-02 19:21:52 -04:30
José Lorenzo Rodríguez
1acbf15c00 Removing RequestHandlerComponent::_header() method 2010-08-02 19:17:43 -04:30
José Lorenzo Rodríguez
cb63cd171c Fixing typo 2010-08-02 19:12:58 -04:30
José Lorenzo Rodríguez
bbbb81e10a Adding CakeResponse::download() method 2010-08-02 19:10:38 -04:30
José Lorenzo Rodríguez
5fb320f31d Refactoring RequestHandler methods to use the response object 2010-08-02 19:10:01 -04:30
José Lorenzo Rodríguez
4fd032bc10 Refactoring RequestHandlerComponent::mapType() and added response object property to the component 2010-08-02 19:07:26 -04:30
José Lorenzo Rodríguez
040740c05d Changing the order for comparisson checking on some types, when looking for a mime type 2010-08-02 19:04:53 -04:30
Juan Basso
ae2fa908c5 Dont use private attributes as tables in CakeSchema. Fixes #7 2010-08-02 00:22:46 -03:00
mark_story
3099a15f17 Removing old check for view == 'Theme'. This allows Scaffold to work well with Themed controllers. Test case added. Fixes #255 2010-08-01 22:25:29 -04:00
José Lorenzo Rodríguez
87eb1ec697 Adding the ability to add custom content types to CakeResponse 2010-08-01 14:22:02 -04:30
José Lorenzo Rodríguez
077f71aaa1 Refactoring controller rendering to use the CakeResponse object 2010-08-01 01:38:45 -04:30
Juan Basso
7e7a2c57e2 Fixing changes made in commit 522446e to works with PHP 5.2-. Refs #974 2010-08-01 02:55:30 -03:00
José Lorenzo Rodríguez
0824348db1 Removing Controller::output property and refactoring methods to not use it. CakeResponse::body() should be used instead 2010-08-01 01:13:41 -04:30
José Lorenzo Rodríguez
f9c97383e9 Refactored Controller::disableCache() to use the CakeResponse object, method was also deprecated 2010-08-01 00:16:50 -04:30
José Lorenzo Rodríguez
60f504a470 Refactored Controller::header() to use the CakeResponse object, deprecated Controller::header() and Controller::httpCodes() 2010-08-01 00:13:00 -04:30
José Lorenzo Rodríguez
9d104fee73 Refactoring Controller::redirect() to use the CakeResponse object 2010-08-01 00:10:46 -04:30
José Lorenzo Rodríguez
3ab4e09e11 Moving Controller::httpCodes() to CakeResponse 2010-08-01 00:09:09 -04:30
José Lorenzo Rodríguez
abafdb037b Implementing the CakeResponse::compress() method 2010-07-31 19:30:25 -04:30
José Lorenzo Rodríguez
8780f0b33d Implementing CakeResponse::cache() 2010-07-31 18:31:50 -04:30
José Lorenzo Rodríguez
5ba0e43aa3 Implementing CakeResponse::disableCache() 2010-07-31 17:40:49 -04:30
José Lorenzo Rodríguez
20d1e483cc Implementing and tesing CakeResponse::send() 2010-07-31 16:58:13 -04:30
José Lorenzo Rodríguez
d1808db0df Changing the encoding method for "charset" 2010-07-31 14:40:58 -04:30
José Lorenzo Rodríguez
2a4b30dba9 Implementing CakeResponse::header() method 2010-07-31 14:13:21 -04:30
mark_story
509a9e14e2 Fixing condition missing a model name in the TreeBehavior. Fixes #961 2010-07-31 14:29:00 -04:00
José Lorenzo Rodríguez
a2eac24ec0 Removing second parameter from CakeResponse, the response should not be magical 2010-07-31 13:10:37 -04:30
José Lorenzo Rodríguez
159ac2038e Testing remaining implemented methods 2010-07-31 13:04:53 -04:30
mark_story
9f718de0b6 Reverting changes made in [60ab9800e2]. Restoring use of isset() and $_SESSION = null. Fixes #971 2010-07-31 13:09:40 -04:00
mark_story
522446e0c2 Fixing issues where route elements could not have '-' in the parameter name because of limitations in pcre named capturing subpatterns. Tests added. Fixes #974 2010-07-31 13:03:45 -04:00
José Lorenzo Rodríguez
2c7b21b977 Completinng mime types array 2010-07-31 12:33:39 -04:30
José Lorenzo Rodríguez
f432de830c Implementing some function in the response object, adding test case 2010-07-31 12:33:02 -04:30
mark_story
2b1efafe65 Applying optimization from 'michaelc' to reduce number of strtolower() calls in AclBehavior. Fixes #972 2010-07-29 22:04:22 -04:00
José Lorenzo Rodríguez Urdaneta
ffd7066fa4 Adding the CakeREquest object with initial function signatures and parameters 2010-07-29 00:54:16 -04:30
Juan Basso
527446a3d1 Changing the RequestHandler to use new Xml class. 2010-07-28 21:29:12 -03:00
Juan Basso
53f8353f92 Updating Set to use new Xml class. 2010-07-28 19:53:52 -03:00
Juan Basso
b862d68016 Support to namespaces in Xml::toArray. 2010-07-28 19:46:35 -03:00
Juan Basso
f4d5230dfa Fixing the read for toArray of content when have child or attribute in xml. 2010-07-28 18:53:36 -03:00
Juan Basso
8f1bdd5378 Change to RssHelper use Xml class instead XmlHelper. 2010-07-28 17:47:02 -03:00
ADmad
6527e9269a Fixing detection and automatic appending of extension '.js' to urls in call to HtmlHelper::script(). Closes #965 2010-07-29 02:11:00 +05:30
José Lorenzo Rodríguez Urdaneta
69ee014a60 Merge branch '2.0' into 2.0-session 2010-07-27 22:27:17 -04:30
José Lorenzo Rodríguez Urdaneta
1c8ad1d1cc Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-07-27 22:26:06 -04:30
José Lorenzo Rodríguez Urdaneta
4c71dd845e Merge remote branch 'origin/2.0' into 2.0-request
Conflicts:
	cake/libs/controller/components/auth.php
	cake/tests/cases/libs/controller/components/auth.test.php
2010-07-27 22:02:08 -04:30
mark_story
272b327dc3 Fixing issue where $error would be set to an array. 2010-07-27 22:27:44 -04:00
mark_story
19d8c9e6bb Removing a call to __setError() that isn't an error. 2010-07-27 22:27:44 -04:00
mark_story
8db0a19585 Refactoring duplicated logic into a method. 2010-07-27 22:27:44 -04:00
mark_story
ef586d9917 Updating test case to use autoRegenerate. 2010-07-27 22:27:43 -04:00
mark_story
6ff7ad68c9 Fixing some infinite loop issues in the test cases for CakeSession. 2010-07-27 22:27:43 -04:00
mark_story
b3febb483e Fixing incorrect use of Cache::gc(). It has no parameters for now. 2010-07-27 22:27:43 -04:00
mark_story
81f6f43193 Moving a few things around to better replicate how CakeSession behaved in 1.3. Also fixes the countdown & session id regeneration feature. Still need to write a test case for it though. 2010-07-27 22:27:43 -04:00
mark_story
d2097c514f Fixing issue where infinite loops would occur when a session was first created. 2010-07-27 22:27:43 -04:00
mark_story
977ffa96be Removing dead properties and methods from SessionComponent.
Sessions should be started as soon as the component is constructed. So there is no reason to have an active()/activate() method.
2010-07-27 22:27:43 -04:00
mark_story
574bfe6b67 Changing clear of $_SESSION to null instead of array(), makes checks later easier. Removing _checkValid call from destroy and making it run in start(), as destroy() calls start(). 2010-07-27 22:27:43 -04:00
mark_story
db5c44e386 Adding support + test cases for plugin and app/libs session handlers. 2010-07-27 22:27:42 -04:00
mark_story
18b6668a34 Moving tests from SessionComponent to CakeSession, as that is where the features actually are. Removing Security.level/Security::inactiveMins() calculations. 2010-07-27 22:27:42 -04:00
mark_story
28b9ed7264 Adding test cases for DatabaseSession and fixing a test case in CacheSession. 2010-07-27 22:27:13 -04:00
mark_story
951eeae817 Extracting handler location into a method.
Moving DatabaseSession and CacheSession into separate files.  Tests to come soon.
2010-07-27 22:27:13 -04:00
mark_story
49397c74af Making cache config used for cache session storage configurable. 2010-07-27 22:27:13 -04:00
mark_story
f5d81e53fc Refactoring Cache and Database session handlers into a separate class, and adding an interface for custom session handlers. Tests updated. 2010-07-27 22:27:13 -04:00
mark_story
a8b05c2fbc Adding a check for '' and failure. When trying to Cache '', FileEngine will return false. This shouldn't trigger an error inside Cache. 2010-07-27 22:27:12 -04:00
mark_story
339fa29502 Updating CakeSession test case and fixing a few issues in the default settings. 2010-07-27 22:27:12 -04:00
mark_story
b247559e9e Starting to implement new session configuration setup. Test case updated. 2010-07-27 22:27:12 -04:00
predominant
7501fcf46d Add test for empty read() calls on CakeSession 2010-07-27 22:27:12 -04:00
predominant
ca65689dd9 Change _setHost() on CakeSession to accept parameter to ease testing, add test cases for host setting, and port stripping. 2010-07-27 22:27:12 -04:00
predominant
a63474a54d Add test for path containing question, and fix assignment of CakeSession::path 2010-07-27 22:27:12 -04:00
predominant
f5565895e9 Removing __regenerateId method, and moving code to renew(). 2010-07-27 22:27:11 -04:00
predominant
afede663c0 Reducing redundant code for CakeSession. 2010-07-27 22:27:11 -04:00
predominant
725bfc3e12 Create _setPath() and _setHost to simplify startup. 2010-07-27 22:27:11 -04:00
mark_story
4b65ebd64f Making SessionComponent mostly a wrapper for CakeSession.
Adding CakeSession::begin() to replace SessionComponent::__start().
Tests updated.  Tests related to autoStart were removed/skipped as that feature isn't really around right now.
2010-07-27 22:27:11 -04:00
mark_story
e660416545 Making CakeSession::write() able to write hashes of data. 2010-07-27 22:26:03 -04:00
predominant
4e9d76e806 Fixing session write use issue. 2010-07-27 22:26:03 -04:00
predominant
dd3e0facd2 Trim down CakeSession::started() 2010-07-27 22:26:03 -04:00
predominant
db97df31cd Adding static to regen 2010-07-27 22:26:03 -04:00
predominant
1dd02b77b2 Adding static to destroy() 2010-07-27 22:26:03 -04:00
mark_story
f47ee0d29a Making CakeSession destory() make started() not return true. Fixing tests that tried to modify session config while a session was active. 2010-07-27 22:26:03 -04:00
mark_story
daab018777 Removing code for PHP < 5.1 which is not supported by 2.0 2010-07-27 22:26:03 -04:00
mark_story
1938e57cbc Making userAgent check test pass.
Reformatting code inside valid().
2010-07-27 22:26:02 -04:00
predominant
b60b077056 Fix __startSession being called after method rename to _startSession. 2010-07-27 22:26:02 -04:00
predominant
34a6808d5d Move CakeSession database configuration to separate method, cutting down init(). 2010-07-27 22:26:02 -04:00
predominant
632d1f13ae Minor refactor for CakeSession. 2010-07-27 22:26:02 -04:00
predominant
9bddd9a861 Minor refactor of if()'s 2010-07-27 22:26:02 -04:00
predominant
06f9d748e2 Fix session path/base for init() 2010-07-27 22:25:37 -04:00
predominant
16f4899821 Fix destroy() calling old constructor on CakeSession 2010-07-27 22:25:37 -04:00
predominant
ea7d45cb11 Remove unset() 2010-07-27 22:25:37 -04:00
predominant
b0e4a09d38 Rename constructor to init() and add init() call at bottom of CakeSession. 2010-07-27 22:25:37 -04:00
predominant
86a7263ab5 Fix cookielifetime variable declaration for CakeSession. 2010-07-27 22:25:37 -04:00
predominant
913d54caa0 Remove __start from SessionHelper 2010-07-27 22:25:37 -04:00
predominant
04b67e59fc Fix tests to remove checking of session ID directly on Session Helper. 2010-07-27 22:25:37 -04:00
predominant
17688a6002 Chaned CakeSessn o use static approache. 2010-07-27 22:25:37 -04:00
predominant
0a72de6438 Removing @access doc block lines from CakeSession. 2010-07-27 22:25:05 -04:00
predominant
58c94b8578 Add access to started() on CakeSession. 2010-07-27 22:25:05 -04:00
predominant
c8c677ae9e Change SessionHelper to extend AppHelper instead of CakeSession. 2010-07-27 22:25:05 -04:00
predominant
390274f807 Remove function exists check on session_write_close() 2010-07-27 22:25:05 -04:00
mark_story
d81d33ffe6 Adding some additional documentation for Model::find(). Fixes #952 2010-07-27 21:25:31 -04:00
Juan Basso
df12e5b4ab Removing @static and @access from Xml class. 2010-07-26 23:44:31 -03:00
Juan Basso
5de7fa5930 Adding PHP Doc to XML class. 2010-07-26 23:42:05 -03:00
Juan Basso
43d49095ae Removing xml helper. Use SimpleXML instead. 2010-07-26 21:39:45 -03:00
Juan Basso
294bef6c46 Refactory of Xml class. Now uses SimpleXMLElement to manipulate XML data. 2010-07-26 21:31:39 -03:00
mark_story
d38857095a Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/model/model.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/libs/controller/components/session.test.php
2010-07-24 22:34:42 -04:00
José Lorenzo Rodríguez Urdaneta
e47a464d63 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-07-24 15:22:12 -04:30
José Lorenzo Rodríguez Urdaneta
1cfcec9a1a Removin use of File class in favor of SplFileObject 2010-07-24 15:21:14 -04:30
ADmad
91b0a4ba4f Changing Tree behavior's function names to be camel cased as per convention 2010-07-24 23:32:49 +05:30
mark_story
43127caad2 Making Cache::write() trigger warnings when a cache engine returns false from a write. Tests added. Fixes #877 2010-07-23 21:40:57 -04:00
José Lorenzo Rodríguez Urdaneta
88ea68af96 Using keyword self instead of Configure, removing use of File class in favor of SplFileObject 2010-07-23 18:42:30 -04:30
Juan Basso
5b7b2d074e Putting the port in header Host, following RFC 2616 item 14.23. Fixes #947. 2010-07-23 00:13:19 -03:00
mark_story
572f79be67 Fixing failing tests caused by strtolower() in AuthComponent. 2010-07-20 23:44:25 -04:00
mark_story
f6c7be9d22 Adding omitted import for Multibyte to i18n. Fixes #929 2010-07-19 23:18:42 -04:00
Scott Reeves
f44911f6dc Fixing typo in parameter description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:20 -04:00
Scott Reeves
ba9fc94977 Fix typo in variable description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:12 -04:00
Scott Reeves
b717abe1aa Fixing typo in Constructor description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:15:00 -04:00
Scott Reeves
ba59c93187 Fixing typo in method description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:51 -04:00
Scott Reeves
037a7628c4 Fixing typo in parameter description.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:43 -04:00
Scott Reeves
742bb29118 Fixing typo in variable description for logoutRedirect.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-19 23:14:06 -04:00
mark_story
f01b4ae13b Updating version numbers to 1.3.3 2010-07-18 23:00:24 -04:00
mark_story
41997b06e1 Fixing issues where mb_internal_encoding() might not be correctly set, causing email subjects to be incorrectly encoded. Tests added. Fixes #904 2010-07-18 20:48:15 -04:00
José Lorenzo Rodríguez Urdaneta
bc27d1eae4 Returning only booleans in Model::__isset() and removing return by reference in Model::getDataSource() 2010-07-15 23:17:13 -04:30
José Lorenzo Rodríguez Urdaneta
b8b4647355 Removing use of cakeError in Model and replacing it with an Exception 2010-07-15 23:11:30 -04:30
mark_story
4c27c24a72 Fixing issue in DboSource where COUNT() was hardcoded, omitting any other aggregate functions. Replaced with a regexp that accepts only letters. Test case added. Fixes #878 2010-07-15 23:17:38 -04:00
José Lorenzo Rodríguez Urdaneta
6fb930c73b Removing assignments by reference in model class 2010-07-15 22:16:19 -04:30
Ceeram
32ea6d24cf Moving Component::beforeRender triggering to allow components to modify
the view class to use for the render() call.  Fixes #917

Signed-off-by: mark_story <mark@mark-story.com>
2010-07-15 21:54:18 -04:00
José Lorenzo Rodríguez Urdaneta
a57e5e8c68 Replacing direct reads to schema cache and routing them to the correct method 2010-07-15 21:19:23 -04:30
José Lorenzo Rodríguez Urdaneta
5d1e6f9e4f Fixing errors with displayField 2010-07-15 21:18:16 -04:30
José Lorenzo Rodríguez Urdaneta
a13be623b5 Making the model require database connection only wen needed or requested 2010-07-15 21:16:52 -04:30
José Lorenzo Rodríguez Urdaneta
e165f7d559 Changing how dynamic "with" models are loaded
Changing all calls to get model's datasourse to use Model::getDatasource()
2010-07-14 23:19:38 -04:30
mark_story
21f359bff9 Removing additional call to camelize(). Fixes #913 2010-07-14 22:07:41 -04:00
Scott Reeves
15435e9d6f FormHelper::create should use domId to determine the default ID of the form tag.
Signed-off-by: mark_story <mark@mark-story.com>
2010-07-14 21:59:16 -04:00
José Lorenzo Rodríguez Urdaneta
c1a9a2e263 Correctly registering plugin models in CR, initial test case onmodel associations lazy loading 2010-07-14 19:23:41 -04:30
José Lorenzo Rodríguez Urdaneta
96f834a7ea Various bugfixes in model associations lazy loafing for "with" associations 2010-07-14 17:54:19 -04:30
José Lorenzo Rodríguez Urdaneta
fdf91194a6 Initial approach for model associations lazy loading, all model tests passing 2010-07-14 16:58:12 -04:30
José Lorenzo Rodríguez Urdaneta
91c3cd8905 Refactoring Model::__createLinks to not loose the plugin name when creating the association 2010-07-13 23:28:48 -04:30
José Lorenzo Rodríguez Urdaneta
4759b7adac Merge branch '2.0-phpunit' into 2.0 2010-07-13 22:29:43 -04:30
mark_story
c9079c8048 Removing magical un-removable plugin concatenation in Controller::loadModel(). Adding test case from 'real34'. Fixes #858 2010-07-13 20:19:31 -04:00
Thomas Ploch
fb9faf10f7 Added missing option arrays to abstract function definitions in JsBaseEngineHelper. Fixed test cases accordingly. Fixes #704 . 2010-07-13 20:04:11 -04:00
mark_story
5c076d44db Adding import to Helper so its tests run in CLI. 2010-07-11 20:01:24 -04:00
mark_story
6d8724097e Changing check in AjaxHelper::link() so lazy users don't get type errors. Fixes #902 2010-07-11 13:47:40 -04:00
mark_story
65efd675c1 Fixing fatal error caused by associated models using a datasource that is not a subclass of dbo_source. Test added. Fixes #873 2010-07-11 13:06:33 -04:00
mark_story
eda79aefb2 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-07-10 18:39:55 -04:00
Juan Basso
9fe5f360eb Adding a default value to options param in JsEngine effect to avoid error in some php versions. 2010-07-10 18:15:09 -03:00
mark_story
5d2c48fd9c Fixing failing tests caused by strtolower() in AuthComponent. 2010-07-10 12:00:09 -04:00
mark_story
413b875eef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/controller/controller.php
2010-07-10 11:49:58 -04:00
mark_story
5c4d46abda Removing reference operators. 2010-07-10 11:45:10 -04:00
mark_story
a04c87c42a Adding App::init() to bootstrap App now that its static. 2010-07-10 11:40:06 -04:00
mark_story
d28f7f4144 Fixing failing test. 2010-07-10 11:32:12 -04:00
mark_story
f202f89974 Initial port of App to a static class, one test is failing. 2010-07-10 00:48:45 -04:00
mark_story
0e2a313145 Removing reference operators from controller.
Removing cakeDebug as its no longer used.
2010-07-10 00:32:35 -04:00
mark_story
3ae1501fd0 Removing more strtolower loops. 2010-07-09 23:58:48 -04:00
mark_story
b7310afddf Removing strtolower() loops on method names, as casing is preserved in php5. 2010-07-09 23:49:48 -04:00
Juan Basso
7dae4a7fd8 Avoiding error to unlink files in Windows. Fixed lock in file cache. 2010-07-07 23:36:13 -03:00
mark_story
103346155f Fixing HttpSocket losing auth credentials when multiple requests are made with the same object. Fixes #893 2010-07-06 22:30:48 -04:00
mark_story
cbccd16c46 Adding visibility and static keywords to connection manager. 2010-07-05 23:08:25 -04:00
mark_story
5d8e27d97b Removing @access and @static where they are not needed anymore. 2010-07-05 22:57:23 -04:00
mark_story
fdafa6b3bd Adding visibility and static keywords to ClassRegistry. 2010-07-05 22:44:20 -04:00
mark_story
a0647e5a8f Making static methods static. 2010-07-05 22:39:09 -04:00
mark_story
a2c1ca92b4 Converting Multibyte class to use static methods and properties. 2010-07-05 22:35:13 -04:00
mark_story
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
mark_story
4a32a39c22 Updating doc blocks. 2010-07-05 21:57:39 -04:00
mark_story
02e25f7557 Changing Configure::read() to not have a default value, and instead return all values in configure when no param is supplied. Test cases updated. Fixes #503 2010-07-05 21:50:36 -04:00
mark_story
2fee0b5b63 Updating console bootstrap process. 2010-07-04 22:03:25 -04:00
mark_story
b2351ef3c9 Updating Configure to be a fully static class. 2010-07-04 22:00:49 -04:00
mark_story
90b2123656 Updating Inflector to use static methods and properties.
Reducing the number of cache properties to one.
Deleting PHP4 specific tests.
2010-07-04 21:46:48 -04:00
mark_story
60ab9800e2 Fixes issue where CakeSession::destroy() would fail to properly restart the session. Tests added. Fixes #787 2010-07-03 18:34:02 -04:00
mark_story
4cd43553b4 Fixing issues where multiple reset bindModel() calls would cause incorrect associations to be restored.
Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
2010-07-03 18:05:14 -04:00
mark_story
57e59ecca4 Merge branch '2.0' into 2.0-request 2010-07-01 18:21:44 -04:00
mark_story
62e16c7058 Fixing issues where permissions would not be set to world writable on file caches. 2010-07-01 18:18:12 -04:00
mark_story
17a7a96ba2 Fixing issue where non-reset associations would get reset by resetAssociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868 2010-07-01 12:39:50 -04:00
mark_story
a8e5e587c6 Making RequestHandler able to use the accept header to detect and switch layout/view paths. Fixes #729 2010-07-01 12:01:46 -04:00
mark_story
81d03857d7 Updating doc block and exception in CakeRequest. 2010-07-01 12:00:53 -04:00
mark_story
a7a4285a80 Renaming __requestContent to _contentTypeMap 2010-07-01 00:50:53 -04:00
mark_story
427e859b52 Refactoring how prefers() works. Tests updated.
Removing support for array args in setContent().
2010-07-01 00:46:28 -04:00
mark_story
ba287ec99e Updating accepts() and doing some refactoring. 2010-07-01 00:26:15 -04:00
mark_story
8d32ad2821 Starting to update RequestHandler methods to use CakeRequest. RequestHandler will provide alias/mapped access to features in CakeRequest. Tests updated and expanded. 2010-07-01 00:13:13 -04:00
mark_story
6e516cae73 Expanding doc blocks for CakeRequest. 2010-07-01 00:12:28 -04:00
mark_story
ea0f9cffea Moving accepts() into CakeRequest.
Adding test cases.
2010-06-30 23:25:45 -04:00
mark_story
8b847cffef Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/helper.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:54:28 -04:00
mark_story
ef6e01f21f Making themePath work with E_STRICT. 2010-06-30 22:48:30 -04:00
mark_story
2020675078 Merge branch '1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
2010-06-30 22:47:27 -04:00
mark_story
991d035806 Fixing respondAs() so it can be called multiple times. Test cases added for respondAs. Fixes #842 2010-06-30 22:34:33 -04:00
mark_story
dc72529648 Implementing assettimestamps for themes and plugins. Tests added. Fixes #804, #879 2010-06-30 20:47:54 -04:00
mark_story
91f8e220e4 Adding App::themePath(). Will be used to reduce code duplication in a variety of places. 2010-06-30 20:17:17 -04:00
mark_story
e023350af5 Updating API docs related to DboSource::$cacheMethods. Fixes #870 2010-06-30 08:52:39 -04:00
mark_story
735ac17b85 Updating documentation on App::objects() so it more reflects what the method does. Fixes #874 2010-06-30 08:45:06 -04:00
mark_story
dedc85390c Adding header() to get header/server vars.
Adding OPTIONS to the detector list.
2010-06-29 00:24:29 -04:00
mark_story
ea322b8f78 Fixing issue where getCrumbList() was overwriting attributes. 2010-06-28 23:45:36 -04:00
mark_story
7c0cda7ce5 Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
2010-06-28 23:41:48 -04:00
mark_story
1c47702cb9 Updating formatting to match coding standards. 2010-06-28 22:53:33 -04:00
Leszek Stachowski
68a9c9c5ab Added HtmlHelper::getCrumbList() to generate semantically correct
(x)html breadcrumb navigation path and a test to it. Fixes #856

Signed-off-by: mark_story <mark@mark-story.com>
2010-06-28 22:36:28 -04:00
mark_story
cd8dff362d Merge branch '2.0-phpunit' into 2.0
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/controller/components/email.test.php
2010-06-28 22:31:35 -04:00
mark_story
94965f0f6c Adding an additional test for View::entity().
Fixing issue where nulls would be shifted onto the entity array causing incorrect name attributes.  Fixes #867
2010-06-28 21:38:17 -04:00
mark_story
ecf7811b7a Merge branch '2.0' into 2.0-request
Conflicts:
	cake/dispatcher.php
	cake/libs/controller/components/request_handler.php
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
4b93e61ed3 Adding cookieLifeTime var declaration as it was omitted.
Updating session timeout values so they reflect their values in the past.
Making cookieLifeTime configurable in the medium/low security levels.
Fixing Config.timeout setting to go back to 10.
Fixes #798
2010-06-27 12:52:18 -04:00
mark_story
c119ec4d23 Merging in changes from Voidet to correct session times. Minutes were
being used instead of seconds, for a value that expected seconds.

Conflicts:
	cake/libs/cake_session.php
	cake/tests/cases/libs/controller/components/session.test.php
2010-06-27 12:17:37 -04:00
mark_story
b9383f13dc Adding some additional documentation for FormHelper::inputs(). 2010-06-27 00:39:31 -04:00
mark_story
929bb5769e Merge branch '1.3' into 2.0
Conflicts:
	app/webroot/index.php
	cake/console/templates/skel/webroot/index.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/controller/scaffold.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/model_behavior.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
José Lorenzo Rodríguez Urdaneta
4689be643b Migrating EmailTest to phpunit 2010-06-25 00:02:20 -04:30
predominant
83651091ce Refactor session timeouts. 2010-06-24 10:30:12 +10:00
Juan Basso
9bbaf153f7 Setting cookies in a single line. Fixes #48 2010-06-23 00:10:21 -03:00
mark_story
5945edd983 Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838 2010-06-21 21:17:37 -04:00
Juan Basso
26d20b6d62 Fixing wrap for html mode in e-mails. Fixes #663 2010-06-21 00:37:25 -03:00
Juan Basso
2a4489cdf2 Naming conventions to datasources with plugins. Fixes #819 2010-06-20 23:53:54 -03:00
Thomas Ploch
2d20215e53 Converted JsBaseEngineHelper to an abstract class. Fixes #703 .
Signed-off-by: mark_story <mark@mark-story.com>
2010-06-20 22:21:21 -04:00
mark_story
0c8088c77d Fixing parse error. 2010-06-20 22:17:47 -04:00
mark_story
2db510d1c1 Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832 2010-06-20 21:47:34 -04:00
mark_story
50144d6b5b Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571 2010-06-12 22:50:09 -04:00
mark_story
d1651db9a8 Fixing typo in Scaffold that caused error messages to display incorrectly. Fixes #813 2010-06-11 10:01:02 -04:00
mark_story
df3432aa86 Updating doc blocks in ModelBehavior. Refs #810 2010-06-11 09:55:39 -04:00
José Lorenzo Rodríguez Urdaneta
0f33560515 Migrating Xcache test to phpunit 2010-06-10 23:11:29 -04:30
mark_story
f0d755bd8e Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806 2010-06-10 19:11:26 -04:00
mark_story
e5df32e9d9 Adding omitted documentation information. 2010-06-10 14:23:49 -04:00
mark_story
ec5ad93a68 Updating doc blocks for ModelBehavior so they better reflect the actual behaviour of the methods.
Removing unused variable assignment.
Fixes #810
2010-06-10 13:54:04 -04:00
José Lorenzo Rodríguez
fa8df12fa0 Converting AuthTest to phpunit. Adding setter and getter method loggedIn() 2010-06-10 00:03:49 -04:30
José Lorenzo Rodríguez
f4cf945e30 Migrating DboSqliteTest to phpunit 2010-06-09 23:33:41 -04:30
José Lorenzo Rodríguez
bc71e14041 Merge branch '2.0-phpunit' of github.com:cakephp/cakephp into 2.0-phpunit
Conflicts:
	cake/tests/cases/libs/controller/components/session.test.php
2010-06-09 21:01:56 -04:30
Juan Basso
d5ddd8ee5f Fixing check of EHLO/HELO in EmailComponent. Fixes #794 2010-06-09 19:22:06 -03:00
mark_story
2c6bf51bd2 Converting SessionComponent over to PHPUnit.
Adding a few getter/setter methods to fix visibility issues in the test cases.
2010-06-09 17:15:34 -04:00
mark_story
ad8b70cec2 Removing continue statement that did nothing.
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
José Lorenzo Rodríguez
fa1ae280ca Migrating SessionComponentTest to PHPUnit and adding public accessor method for varible in SessionComponent 2010-06-09 09:30:00 -04:30
mark_story
c5e4ab2366 Adding return to RequestHandlerComponent::accepts() as it was missing.
Updating RequestHandlerComponent tests to work with PHPUnit.
2010-06-09 00:02:49 -04:00
mark_story
a88b8dd5b9 Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered.
Tests added.  Fixes #722
2010-06-07 23:43:35 -04:00
Kyle Robinson Young
a9fa7ac240 Fix for auth component userModel with plugins. Fixes #799 2010-06-07 23:19:13 -04:00
José Lorenzo Rodríguez
bd7ce3804e Migrating CakeSchemaTest to PHPUnit 2010-06-07 00:05:40 -04:30
predominant
0eea0ce0f8 Updating version numbers to 1.3.2 2010-06-07 02:21:51 +10:00
José Lorenzo Rodríguez
fd4db4184a Migrated ConnectionManager to phpunit 2010-06-04 23:47:38 -04:30
José Lorenzo Rodríguez
c23fe5d72e Migrating ModelReadTest to PHPUnit 2010-06-04 23:07:29 -04:30
mark_story
e41e89cd2a Making magic select not override magic hidden. Tests added.
Fixes #782
2010-06-04 00:20:14 -04:00
mark_story
bd6e16be26 Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789 2010-06-03 23:20:37 -04:00
Juan Basso
3c27c4c41e Ajusting smtpOption in EmailComponent. Fixes #779 2010-06-03 14:46:20 -03:00
Juan Basso
b480d80c82 Avoid undefined index if not define timeout in EmailComponent. Fixes #779 2010-06-02 18:14:58 -03:00
mark_story
7682c5896e Changing how merged rules are cleared so it doesn't generated notice errors in PHP4. Test added. Fixes #762 2010-06-01 23:41:51 -04:00
José Lorenzo Rodríguez
7d6ac7585a Migrating ModelValidationTest to phpunit 2010-06-01 00:19:11 -04:30
mark_story
02a04abf6b Fixing return values of methods, and updating tests to run properly in Phpunit which uses exceptions instead of errors. 2010-05-30 22:57:28 -04:00
mark_story
ea2f0327f5 Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769 2010-05-30 22:46:46 -04:00
mark_story
713e6e6287 Fixing parse error that caused scaffold test to not run and not pass. 2010-05-30 22:41:52 -04:00
Juan Basso
74dad04323 Fixing read from SMTP by EmailComponent. Closes #772 2010-05-30 23:29:21 -03:00
mark_story
fc79dc6232 Merge branch '2.0' into 2.0-phpunit
Conflicts:
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/code_coverage_manager.php
2010-05-30 22:13:09 -04:00
mark_story
7ed67e5959 Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768 2010-05-30 20:30:58 -04:00
mark_story
07948a733d Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769 2010-05-30 11:16:40 -04:00
mark_story
0180daaad3 Updating version numbers to 1.3.1 2010-05-29 13:26:34 -04:00
mark_story
dea33f6452 Fixing pass by reference errors in php5.3. Fixes #451 2010-05-29 13:19:12 -04:00
mark_story
7cde3094f0 Removing trim() that was performed when reading a file with a lock() enabled. This was causing a failure in php5. 2010-05-29 12:50:42 -04:00
renan.saddam
c96d074722 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-05-29 12:23:04 -03:00
renan.saddam
8f5112b8d7 Changing break; to continue; so it will process the next tables on the array, tests added. 2010-05-29 12:22:16 -03:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10:00
predominant
f63f15812e Merge remote branch 'origin/1.3' into 1.3 2010-05-30 01:13:40 +10:00
predominant
f06f0dae8b Numerous "Enter description here" block comments updated to have meaningful descriptions. 2010-05-30 01:10:48 +10:00
Juan Basso
e02cb81a67 Reading a smtp response until EOL. Fixes #378 2010-05-29 12:04:29 -03:00
mark_story
7e6773c60c Updating ErrorHandler and CakeErrorController to use CakeRequest. Tests updated. 2010-05-29 00:21:02 -04:00
mark_story
3e3265aa7c Adding omitted echo. 2010-05-29 00:20:16 -04:00
mark_story
f4abc51062 Removing dependency on RequestHandler from Security component. 2010-05-29 00:01:11 -04:00
mark_story
8acb82f567 Updating Security component to use CakeRequest and updating its test case. 2010-05-28 23:57:43 -04:00
mark_story
8b6c974cd0 Making FileEngine not greedily clear files in a directory that may belong to another cache configuration. Tests added. Fixes #754 2010-05-27 00:01:17 -04:00
mark_story
cd255d5031 Merge branch '1.3' of github.com:cakephp/cakephp into 1.3 2010-05-25 23:08:06 -04:00
Martin Radosta
64adfacd3e Making DboSource::order() accept an expression object. Fixes issues with
sql parsing over quoting special SQL syntax. Tests added.  Fixes #747

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-25 23:07:29 -04:00
Juan Basso
bc3e745673 Support to EHLO in SMTP server for EmailComponent. Fixes #54, #712, #737 2010-05-24 22:24:58 -03:00
Juan Basso
2d44929598 Optimization on dbo datasource to not repeat ids in find. Fixes #601
Signed-off-by: mark_story <mark@mark-story.com>
2010-05-23 17:22:55 -04:00
mark_story
b73870c33d Removing reference operators in the AclComponent. 2010-05-22 20:20:41 -04:00
ADmad
7d51952801 Removing protected var CakeSession::_started and instead session_id() is now used to check if session is started in CakeSession::started(). This fixes issue where CakeSession::started() returned incorrect value when used across multiple objects. Closes #731 2010-05-23 02:14:07 +05:30
tarcisio
06c1b583f8 fix typo in CakeLog::config()
Signed-off-by: mark_story <mark@mark-story.com>
2010-05-22 10:49:37 -04:00
mark_story
29f2223c6d Removing hardcoded '__' for virtualField separators. Making it an instance property instead. This allows the customization of the separator if needed. Tests added for DboMysql. Refs #655, #730 2010-05-22 00:58:54 -04:00
mark_story
23d4bafd39 Fixing inflection of words ending in causes. Fixes #736 2010-05-21 23:49:49 -04:00
mark_story
82250efc3e Updating doc blocks for FormHelper::input() refs #735 2010-05-20 22:58:20 -04:00
mark_story
94ac914426 Changing Router::$__validExtensions so Router::extensions() always returns an array like the doc block says.
Updating test cases for PHPUnit.
2010-05-20 22:55:25 -04:00
mark_story
7cef278ce2 Fixing missing boolean return in Validation::cc()
Fixing Validation test case to pass under PHPUnit.
2010-05-20 22:30:47 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
predominant
3a81a9e6f2 Remove unnecessary spaces. 2010-05-20 12:17:52 +10:00
Robert Sworder
385ceb434e When using Digest Authentication the passwords do not need to be md5 hashed. Removed incorrect comment.
Fixes #733

Signed-off-by: mark_story <mark@mark-story.com>
2010-05-18 22:19:33 -04:00
Juan Basso
a94b9ee95b Update various links. Closes #392 2010-05-18 22:15:13 -03:00
mark_story
c1c800865c Refactoring repeated blocks of code into a method. 2010-05-17 23:51:41 -04:00
mark_story
f6edbfa6e4 Removing unused properties from Scaffold. 2010-05-17 23:44:11 -04:00
mark_story
76f94d5c75 Fixing form attribute access and broken test. 2010-05-17 23:31:47 -04:00
mark_story
ef85fb1247 Making scaffold methods protected instead of private.
Adding visibility keywords
2010-05-17 23:30:04 -04:00
mark_story
1d884cc00f Updating Scaffold to use the CakeRequest object.
Updating Scaffold tests.
2010-05-17 23:11:47 -04:00
mark_story
8b66a905b8 Fixing syntax error caused by bad merge. 2010-05-17 21:57:12 -04:00
mark_story
f114d4299d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/router.php
	cake/tests/cases/libs/router.test.php
2010-05-17 21:52:14 -04:00
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods.
Tests added.
Fixes #728
2010-05-17 18:25:50 -04:00
mark_story
4915645fb1 Applying patch from 'Daren Thomas' fixes issues where sorting on virtualFields did not work properly when using aliased sort link keys. Tests added. Fixes #680 2010-05-16 23:42:14 -04:00
mark_story
b2d8536b3b Fixing Authcomponent tests. Updating the component + tests to use the new request object.
Deprecating a number of Authcomponent properties.
2010-05-15 00:55:15 -04:00
mark_story
36a71582fc Fixing issues with Controller::referer() and CakeRequest::referer(). Tests updated. 2010-05-15 00:53:15 -04:00
mark_story
4520ff7c82 Making View pass request onto helpers and extract it from a Controller. 2010-05-15 00:52:06 -04:00
mark_story
e6a743b163 Making JsHelper use its request object methods. 2010-05-15 00:51:26 -04:00
mark_story
0eebda9ee1 Updating HtmlHelper test to use request object.
Removing reference operators.
2010-05-14 23:11:38 -04:00
Mark Story
3983bf318d Updating PaginatorHelper and its test cases to use the request object. 2010-05-14 00:32:56 -04:00
Mark Story
c5dfd128fb Updating FormHelper and its tests to use the request object. 2010-05-14 00:21:22 -04:00
Mark Story
0d3011d2c3 Updating CacheHelper to use CakeRequest. 2010-05-14 00:12:29 -04:00
Mark Story
657073aa42 Marking a number of Helper properties as deprecated as they are contained within the CakeRequest object.
Adding a new property for the new request object.
Updating the internals of Helper to use the request object.
Updating the tests to use the request object.
2010-05-14 00:05:45 -04:00
Mark Story
353c600cd7 Removing unreachable code. Fixes #614 2010-05-13 23:38:26 -04:00
Mark Story
046c233a34 Adding Welsh to the supported lists of locales in l10n. Thanks to 'DanAbel' for the 'patch'. Fixes #714 2010-05-13 22:13:59 -04:00
José Lorenzo Rodríguez
8c3df122eb Merge commit 'lorenzo/2.0-phpunit' into 2.0-phpunit
Conflicts:
	cake/tests/lib/reporter/cake_html_reporter.php
	cake/tests/lib/test_manager.php
2010-05-12 23:58:56 -04:30
Mark Story
79839c07d2 Fixing issues where ModelBehavior::detach() would not detach behaviors when a plugin.name was provided. This change makes detach() work like attach(). Tests added. Fixes #711 2010-05-11 23:08:14 -04:00
Mark Story
6add43a4bc Fixing issue where id = null could cause SQL errors when saving more than one record with a null id. Fixes #675 2010-05-11 22:40:56 -04:00
ADmad
3539660cd0 Space is now properly added inbetween when 'asc'/'desc' class is appended to user defined css class in PaginatorHelper::sort. Fixes #710 2010-05-12 00:42:02 +05:30
Mark Story
6e355312bb Fixing issue where Config.timeout wouldn't correctly countdown when many quick requests were sent. 2010-05-11 00:39:10 -04:00
Richard Sbresny
b04a3f8514 Switched over to using the previously unused Security::inactiveMins() method for getting timeout modifiers
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:14:20 -04:00
Richard Sbresny
5cf08cbe92 Updated default values to reflect the static values previously set
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:12:15 -04:00
Richard Sbresny
c62ae5e48a Included timeout multiplier factor to be used not just inside a session start
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:11:44 -04:00
Richard Sbresny
a4950f6940 Updated session timeout calculations to use the security level from core.php as the multiplier.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-11 00:11:20 -04:00
Robert Sworder
ec10a01504 Changing home.ctp to remove references to 1.2. Fixes #705
Signed-off-by: Mark Story <mark@mark-story.com>
2010-05-10 23:48:12 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
José Lorenzo Rodríguez
765de657e6 Fixing PaginatorHelperTest to be compatible with PHPUnit 2010-05-09 18:49:04 -04:30
Mark Story
4b637a0f70 Updating more methods to use request object method instead of deprecated methods. 2010-05-08 10:36:20 -04:00
Mark Story
5040eb7227 Updating RequestHandler and its tests to use the features moved to CakeRequest. Marking a number of methods as deprecated. 2010-05-08 00:59:40 -04:00
Mark Story
78bd7300a2 Moving features from RequestHandler into CakeRequest. 2010-05-08 00:36:03 -04:00
Mark Story
df910026ee Updating Controller::referer() to use the request object if available. Tests updated. 2010-05-08 00:06:13 -04:00
Mark Story
77264da34a Updating Controller tests to always pass in a CakeRequest. Fixing some notice errors that come up in the test cases. 2010-05-08 00:00:19 -04:00
Mark Story
22161874cb Deprecating a number of Controller properties and adding $request. 2010-05-07 23:46:02 -04:00
Mark Story
1a7dce3af6 Updating DboMysql to fix an issue where virtualFields that were simple
aliases to fields on other tables would end up in the wrong place.
Tests added.  Fixes #655
2010-05-07 23:26:13 -04:00
Mark Story
0930b5c63c Adding more documentation for JsHelper::submit(). Closes #681 2010-05-07 21:26:44 -04:00
Mark Story
26f7fcef3c Updating Controller and its tests to use CakeRequest. 2010-05-06 23:23:13 -04:00
Mark Story
2b7723fd12 Removing reference operators and making Controller::__construct take a CakeRequest. If one is passed all the necessary properties will be populated. This lightens the Dispatcher, and gives more control to the end developer. 2010-05-06 23:18:50 -04:00
Mark Story
1a460e47f1 Removing reference operators in Controller and its tests. 2010-05-06 22:48:48 -04:00
Mark Story
04df4a91dd Merge branch '2.0' into 2.0-request 2010-05-06 22:30:37 -04:00
Mark Story
1c3415759a Fixing 'Only variables should be assigned by reference' errors in php4 in form helper. Fixes #643 2010-05-06 22:11:31 -04:00
Mark Story
1c1c511853 Changing how email validation methods are applied, to fix issues where getmxrr() exists but the domain being validated does not have MX records correctly configured. Fixes #634 2010-05-06 21:43:58 -04:00
predominant
719836c41d Updated doc block for added HTTP Status. 2010-05-05 10:09:47 +10:00
Mark Story
e9a7d6d3b9 Splitting CakeRoute and PluginShortRoute into their own files. Also splitting out the test cases. 2010-05-04 00:35:22 -04:00
Mark Story
f76d320688 Making Router a fully static class. Tests updated. 2010-05-04 00:26:02 -04:00
Mark Story
c91d74a9af Making CakeRequest toss an exception when it can't handle a method call. 2010-05-03 23:41:13 -04:00
Mark Story
69275c8996 Adding a parameter to CakeRequest to allow it to skip parsing the environment. 2010-05-03 22:50:38 -04:00
Mark Story
ce10c85367 Making Sanitize::stripScripts() to remove multi-line script and style blocks. Fixes #657 2010-05-03 22:33:20 -04:00
Mark Story
95dbae8acf Making RequestHandler component carry along a passed status code. This fixes issues where RequestHandler hijacks an redirect(). Fixes #658 2010-05-03 22:07:13 -04:00
predominant
87db966383 Remove PHP5 conditional statements. 2010-05-03 13:36:32 +10:00
predominant
c1eaa4b24c Fixed access and removed @access tags. 2010-05-03 13:28:09 +10:00
Mark Story
c48f6d6536 Fixing safe parameter from leaking into request() calls in JsHelper::submit() and JsHelper::link(). Fixes #656 2010-05-02 21:17:10 -04:00
Mark Story
8c7cfb2a1e Changing string offset access. 2010-05-02 18:04:13 -04:00
Mark Story
d94ff92a9d Merge branch '2.0' into 2.0-request
Conflicts:
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/lib/reporter/cake_html_reporter.php
2010-05-02 18:03:23 -04:00
Mark Story
adf604a966 Merge branch '1.3' into 2.0
Conflicts:
	cake/console/templates/default/actions/controller_actions.ctp
	cake/console/templates/default/views/form.ctp
	cake/console/templates/default/views/index.ctp
	cake/console/templates/default/views/view.ctp
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
2010-05-02 17:53:42 -04:00
Mark Story
e11f7da896 Adding support for Router::reverse() to operate on CakeRequest objects. 2010-05-02 02:19:32 -04:00
Mark Story
7e25d94258 Renaming internals of Router.
Adding tests for legacy setRequestInfo() support.
2010-05-02 02:16:16 -04:00
Mark Story
26279851e1 Making Router::setRequestInfo() able to accept arrays. It will convert older style arrays into a CakeRequest object for later use.
Updating uses of Router::setRequestInfo() to just pass the object where possible.
2010-05-02 01:59:56 -04:00
Mark Story
e336df6de8 Updating some uses of Router::setRequestInfo(). 2010-05-02 01:43:37 -04:00
Mark Story
9a1858367f Removing unused and untested feature. 2010-05-02 01:24:44 -04:00
Mark Story
4eef2c19f0 Making CakeRequest::addParams() chainable. Adding CakeRequest::addPaths() to allow easy settings of path variables, its also chainable. Tests added. 2010-05-02 01:22:34 -04:00
Mark Story
bd1365f8ae Changing interactions inside Router so it doesn't need a CakeRequest object, makes changes to Router test not necessary. 2010-05-02 00:29:35 -04:00
Mark Story
12cbf3198a Removing addslashes/stripslashes in cache file generation as they were creating corrupted serialized objects. Replacing with a simple str_replace() on ' instead. 2010-05-02 00:12:53 -04:00
Mark Story
e4cf8a6937 Fixing issue where 'data' could not be accessed with array access, there were tests in Dispatchers tests that expected this. 2010-05-01 23:46:10 -04:00
Mark Story
d2ea077b81 Moving parameter parsing below asset dispatching, should speed up asset dispatching.
Updating + fixing tests to reflect API changes and fixing some issues where router was breaking assets.
2010-05-01 23:19:47 -04:00
Mark Story
aa234bc861 Making CakeRequest keep [url][url] for compatibility issues. 2010-05-01 22:45:31 -04:00
ADmad
f386dca6d8 Controller::loadModel() now returns true when model is succesfully instantiated as stated in docblock. Added test case. 2010-05-02 05:34:38 +05:30
Mark Story
257665eb5b Updating doc blocks for bindModel and unbindModel, explaining that associations are only reset when find() is called. Refs #652 2010-05-01 17:37:23 -04:00
Mark Story
0eb4849803 Renaming a method. 2010-05-01 11:08:58 -04:00
Mark Story
2b08ad6012 Updating fatal tests in Dispatcher tests. Updating Router to use a method instead of a raw array_merge. 2010-05-01 11:07:32 -04:00
Mark Story
40bca71985 Adding tests and features for CakeRequest to parse querystring args from the url parameter in the constructor. Added tests. 2010-05-01 11:04:41 -04:00
Mark Story
fbd70bf23c Making Dispatcher::parseParams require a CakeRequest object instead of as string url. Updating tests in the Dispatcher, and fixing an issue where POST params would be wiped out by Router. 2010-05-01 10:48:30 -04:00
Mark Story
ffd05ffc3e Removing methods from Dispatcher that have been moved to CakeRequest.
Removing test cases for features that don't exist anymore.
Updating Router and Dispatcher to use the request object.
2010-05-01 01:43:06 -04:00
Mark Story
1b5c0cca4d Removing duplicated code and moving methods to protected. 2010-05-01 00:32:43 -04:00
Mark Story
4deacf0b06 Existing tests are now all passing. 2010-05-01 00:18:17 -04:00
Mark Story
c7f4334bff Moving test code around and starting to refactor things in tests. 2010-04-30 23:37:16 -04:00
José Lorenzo Rodríguez
ad51115e12 Fixing bug where required class would be added to form fields when using single rule syntax in $validate even if allowEmpty is set to true
Closes #654
2010-04-30 16:42:59 -04:30
Mark Story
85b86164e3 Starting to move additional methods from Dispatcher into CakeRequest. Tests have been moved, and updated. 2010-04-30 00:13:24 -04:00
Mark Story
51db3c80ef Moving query string params around. Updating test cases. 2010-04-29 23:20:31 -04:00
Mark Story
6dcc680c1a implementing CakeRequest::addDetector() and adding test cases. 2010-04-29 23:08:01 -04:00
Mark Story
734e4fa87a Removing the conditional check around including custom session configuration files. This fixes issues where requestAction could cause loss of session settings, and improves the end developers ability to customize the session. Custom session files should ensure that classes/functions are conditionally declared. Fixes #374, #541 2010-04-29 21:40:12 -04:00
ADmad
afd67e534b Fixing parse error created in commit [6d092552e5]. Closes #647 2010-04-30 03:52:39 +05:30
Mark Story
0daf6e4dba Adding skeleton for addDetector. 2010-04-29 00:33:41 -04:00
Mark Story
a6ee9e352d Expanding doc blocks for methods.
Adding ArrayAccess implementation and test cases.
2010-04-29 00:22:33 -04:00
Mark Story
476a76b7a4 Adding __get() and test cases. 2010-04-29 00:22:33 -04:00
Mark Story
c11095bc54 Adding __call() for undefined method handling. Tests added. 2010-04-29 00:22:33 -04:00
Mark Story
3a0ad6f1a8 Starting CakeRequest::is() and adding tests for various core is() types. 2010-04-29 00:22:32 -04:00
Mark Story
aab4a9413a Adding CakeRequest::referer() and test cases. 2010-04-29 00:22:32 -04:00
Mark Story
64aafd36bb Expanding coverage for CakeRequest. Expanding doc blocks in CakeRequest. 2010-04-29 00:22:32 -04:00
Mark Story
93f4c66035 Adding tests for CakeRequest's ability to munge through the FILES array. Fixing issue where files would be in the wrong place. 2010-04-29 00:22:32 -04:00
Mark Story
8f207a5f69 Moving getClientIp into CakeRequest. Moving relevant tests as well. 2010-04-29 00:22:32 -04:00
Mark Story
15a4607061 Fixing some issues with parameter handling. Adding test cases. 2010-04-29 00:22:32 -04:00
Mark Story
f17eebecf2 Adding CakeRequest and its test case. Moving features from Dispatcher into CakeRequest. 2010-04-29 00:22:32 -04:00
Mark Story
7ea8640b76 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-29 00:22:30 -04:00
predominant
2420bce168 Updated vesion numbers to 1.3.0 2010-04-29 00:21:27 -04:00
ADmad
4efb07b15a Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-29 00:20:35 -04:00
Mark Story
57648c5492 Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-29 00:20:35 -04:00
Mark Story
6d092552e5 Updating bake templates and Scaffold to use less sprintf() and more complete sentences in i18n strings. This should make translations easier to do in a gender correct way. Fixes #210 2010-04-28 23:56:07 -04:00
José Lorenzo Rodríguez
a6f60c1abb Implementing cache lockig in FileEngine using SplFileObject 2010-04-29 00:44:17 +10:00
José Lorenzo Rodríguez
5dce79e424 First steps into removing internal usage of File and Folder class in favor of SPL equivalents 2010-04-29 00:44:04 +10:00
Mark Story
328c58635b Fixing inflection of words ending in analysis. Fixes #619 2010-04-27 23:03:37 -04:00
Mark Story
2fab47e740 Updating doc block for EmailComponent::send(). Fixes #633 2010-04-27 22:50:34 -04:00
Mark Story
bd485c77d3 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-27 22:42:54 -04:00
Mark Story
bb239e3816 Fixing parse error in php4 for MediaView. Also fixing undefined variable error in Dispatcher. Fixes #628 2010-04-27 22:42:33 -04:00
predominant
9243f6601a Merge remote branch 'markstory/2.0' into 2.0 2010-04-26 14:11:07 +10:00
predominant
b13a5c2862 Added access modifiers and static delcarations on Set class. 2010-04-26 12:45:56 +10:00
Mark Story
af6435ece8 Fixing issue where table name was not using fully qualified table names, causing issues with models using table prefixes. Tests added. Fixes #623 2010-04-25 00:22:57 -07:00
predominant
1c064788c5 Updated vesion numbers to 1.3.0 2010-04-25 14:27:29 +10:00
ADmad
46df1be384 Model::deleteAll() now returns false if the 'find' to fetch records ids returns false (in case of sql error). Closes #272 2010-04-25 02:34:18 +05:30
Mark Story
e0b4e3dd96 Merge branch '2.0' of git://github.com/predominant/cakephp1x into 2.0 2010-04-24 01:45:58 -07:00
Mark Story
9ddbd6f686 Removing dependancy on Object from CakeSocket. Making tests less dependant on having a network connection. 2010-04-23 21:41:20 -07:00
Mark Story
a17a38ddf4 Fixing fatal errors in View test.
Removing =& and making tests use instanceof instead of is_object()
2010-04-24 00:22:21 -04:00
Mark Story
c03974ebb2 Expanding documentation for Router::queryString(). 2010-04-24 00:21:17 -04:00
Mark Story
e111735905 Changing AclBase into AclInterface as it is now an interface.
Splitting the test case into separate test cases for each class.
2010-04-23 23:52:36 -04:00
Mark Story
523eda018e Deprecating AclComponent::revoke() and AclComponent::grant() they were simply aliases that create a larger API with no real benefit. 2010-04-23 23:14:55 -04:00
Mark Story
62982c57b4 Making AclComponent throw exceptions when it encounters an error.
Making AclBase an abstract class.
Adding AclComponent::adapter() for runtime modification of the Acl implementation.
Tests added, updated and fixed.
2010-04-23 23:03:51 -04:00
Mark Story
33a2907202 Adding CakeLogInterface and implementing it in core and test suite classes. The new interface is used for method detection instead of a hard method check. Making CakeLog throw exceptions instead of trigger errors when things go wrong. 2010-04-23 22:31:21 -04:00
Mark Story
35c8f9963a Adding @throws to methods that could throw exceptions. 2010-04-23 22:29:57 -04:00
Mark Story
4d4d9e78f8 Adding App::setObjects() as a temporary way to modify App's cache of plugins. This allows the DispatcherTest to successfully run. 2010-04-23 22:04:16 -04:00
Mark Story
d000a11e9b Removing params() from Sanitize. 2010-04-23 21:32:39 -04:00
Mark Story
84002687c8 Making Security a static class.
Fixing static access issues in test case.
2010-04-23 21:28:54 -04:00
Mark Story
33bfe0e5e2 Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
2010-04-23 21:21:31 -04:00
Mark Story
bf566e1aad Fixing failing tests in PaginatorHelper and moving tests related to JsHelper interaction into a separate test method. 2010-04-23 21:10:23 -04:00
predominant
da3103379e Revert "Change URL Validation to use filter_var"
This reverts commit 4e53916021.
2010-04-24 11:01:07 +10:00
predominant
4e53916021 Change URL Validation to use filter_var 2010-04-24 10:56:14 +10:00
predominant
557a6343f9 Minor adjustment to ip validation variables. 2010-04-24 10:51:56 +10:00
Mark Story
c9f103432c Updating Model to use call_user_func_array instead of methods that were previously inherited from Object. 2010-04-23 20:47:40 -04:00
Mark Story
65ddc2b040 Fixing fatal errors caused by calling methods that no longer exist. 2010-04-23 20:45:13 -04:00
Mark Story
0fc106428a Adding exception tossing for invalid cacheengine configuration. 2010-04-23 20:41:29 -04:00
Mark Story
797fa0009a Making Router throw exceptions when invalid route classes are used for routes. 2010-04-23 20:22:02 -04:00
predominant
f65e481ebf Consoloidate duplicate regex strings in money() validation. 2010-04-23 17:04:25 +10:00
predominant
396c025529 Converted validation to use filter_var with ipv4/ipv6 separation matching 1.3 operation. 2010-04-23 16:55:04 +10:00
Mark Story
bc6b8e5dfd Fixing parameters from leaking into the script tag when calling JsHelper::submit(). Added test cases and refactored JsHelper::link(). Fixes #613 2010-04-23 00:04:15 -04:00
predominant
298b44a550 Removing Object extension on Validation. 2010-04-23 13:10:56 +10:00
predominant
4c769ea585 Typo fix in doc block. 2010-04-23 12:58:58 +10:00
predominant
f51ce734bf Import Validation from old 2.0 branch. 2010-04-23 12:53:47 +10:00
predominant
015872445b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/acl.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
2010-04-23 12:52:56 +10:00
kleingeist
6033fc70fa Documentation fix for XmlHelper::serialize
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-22 21:27:17 -04:00
José Lorenzo Rodríguez
fca070fe9e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding tests for and fixing the behavior of `cake acl initdb` it now correctly delegates to SchemaShell.  Fixes #608
  Making TestTask not depend on Inflection rules for creating directory names,  refs #610
  Adding tests for Inflector::rules() clearing cached values.  Fixes #609
  Clear cache of pluralized, singularized and tableize when set rules.
2010-04-22 16:50:25 -04:30
José Lorenzo Rodríguez
65f01fa31c Fixing model introspection in FormHelper to better take in account realted models with aliased names 2010-04-22 16:37:15 -04:30
Juan Basso
bb0ff192f7 Clear cache of pluralized, singularized and tableize when set rules.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-21 22:48:56 -04:00
Mark Story
120fdd9045 Removing other uses of Routing.admin as it has been removed from Router. 2010-04-20 23:43:51 -04:00
Mark Story
a71a8a89b2 Removing support for Routing.admin. Use Routing.prefixes instead. 2010-04-20 23:40:13 -04:00
José Lorenzo Rodríguez
5ceb19304e Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-19 23:33:43 -04:30
José Lorenzo Rodríguez
e1c4b9696b Adding documentation on 'attributes' key for FormHelper::error 2010-04-19 23:32:58 -04:30
Mark Story
661c76802c Making singleton access use a class property. 2010-04-19 23:56:36 -04:00
José Lorenzo Rodríguez
23eea00a0b Fixing FormHelper::error to no add error names and messages as html attributes. Fixes #585
This introduces the special key 'attributes' to FormHelper::error() when passed in the second parameter
The contents of said key will be converted into html attributes for the error container tag
2010-04-19 23:25:57 -04:30
Mark Story
e92e212b8d Fixing Router's constructor.
Adding static visibility to Router methods.
Adding a method for testing Router extensions.
Router::mapResources() now returns the mapped resources
Fixing visibility issues in test cases.
2010-04-19 23:44:45 -04:00
Mark Story
029d2581af Fixing autoFields causing invalid SQL when cross database joins are being done. Tests added. Fixes #476 2010-04-19 22:39:07 -04:00
Mark Story
ea7b32347d Removing some of the singleton access in Debugger. 2010-04-19 00:15:56 -04:00
Mark Story
2bf9504cfb Removing inheritance from Object.
Adding missing visibility keywords, and adding static keywords.
Removing @tags.
2010-04-19 00:10:22 -04:00
Mark Story
c05c9857ac Removing exception throwing from CacheEngine::gc() and subclasses as it randomly caused errors when using one of the affected engines. 2010-04-19 00:04:34 -04:00
Mark Story
b7e4e46251 Removing lonely comment. 2010-04-18 01:17:01 -04:00
Mark Story
40e310c79b Adding a no-op constructor for Object. Fixes issues where numerous sub-classes break because of a missing constructor in Object. 2010-04-18 01:12:44 -04:00
Mark Story
146ec004eb Removing inheritance from Object. Constructor workarounds are no longer needed and Object methods are not used on these classes. 2010-04-18 01:12:00 -04:00
Mark Story
4f0a9c4dc1 Removing PHP4 constructor and __destruct workarounds. 2010-04-18 01:03:57 -04:00
Mark Story
9046083dc8 Removing Overloadable and Overloadable2 they are not needed in PHP5.
Removing inheritance and test cases related to Overloadable.
2010-04-18 01:02:39 -04:00
Mark Story
92289e59f7 Updating ApcEngine so it implements the missing method in the abstract class.. 2010-04-18 00:57:52 -04:00
Mark Story
8ea4475ac3 Removing extra call to unset(). 2010-04-18 00:53:52 -04:00
Mark Story
ca8110ad32 Updating MemcacheEngine to use exceptions and implement missing CacheEngine methods. 2010-04-18 00:46:19 -04:00
Mark Story
d7f16816e6 Adding translation to exceptions in FileEngine. 2010-04-18 00:45:45 -04:00
Mark Story
a886e13666 Making CacheEngine an abstract class, and updating FileEngine to include the not implemented methods. 2010-04-18 00:38:36 -04:00
Mark Story
9ae8b737dc Trimming trailing whitespace. 2010-04-17 13:05:26 -04:00
Mark Story
78f14401ca Fixing issue where using delivery = debug and not using sessions would cause a fatal error. send() will now return the contents that would get written into the session. Fixes #595 2010-04-17 12:27:50 -04:00
Mark Story
bb7cc60d3f Fixing parse error added in last commit :( 2010-04-17 02:13:22 -04:00
Mark Story
0f6e87cab8 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-17 02:10:58 -04:00
predominant
92215e1795 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/libs/inflector.php
	cake/libs/view/helpers/text.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/helpers/time.test.php
2010-04-16 23:43:28 +10:00
predominant
23a22c73b7 Remove "not being used" comment from Model docblock. Fixes #590 2010-04-16 21:45:44 +10:00
predominant
c7fcaf995f Convert getMictime() php4 hack to microtime(true) 2010-04-16 02:58:28 +10:00
predominant
c98021dcd8 Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
predominant
6bd9f0f05b Convert models, datasources and file/folders to new version of translation shortcut function. 2010-04-16 02:00:25 +10:00
predominant
2f8d30d2c0 Convert controllers and sockets to new formate for shorthand translation functions. 2010-04-16 01:52:49 +10:00
predominant
41fe51d4b9 Cache classes converted to new shortcut translation usage. 2010-04-16 01:45:34 +10:00
Mark Story
1fef9e4a78 Making Configure/App methods static, removing reference operators.
Removing deprecated methods.
2010-04-15 00:06:17 -04:00
Mark Story
23b75f4ed2 Moving private members/methods to protected.
Changing Cache methods/members to static.
Removing singleton access to Cache.
2010-04-14 23:56:44 -04:00
Mark Story
79eeb33e35 Fixing constructors
Adding method visibility.
Removing reference operators.
2010-04-14 22:56:51 -04:00
Mark Story
8ef2a82a89 minor optimization to save one call to Helper::model() when creating forms. 2010-04-14 21:00:00 -04:00
ADmad
99e5f4a49f Removing ampersand (&) from default transliteration map 2010-04-15 01:56:38 +05:30
Mark Story
dbe4747add Making static methods static. 2010-04-14 00:29:44 -04:00
Mark Story
f13e70b936 Changing object constructor.
Adding visibility keyword.
2010-04-14 00:25:14 -04:00
Mark Story
cd42047dd5 Making CakeLog a static class, removing PHP4 workarounds and no longer needed singleton. Removes CakeLog::getInstance() 2010-04-14 00:23:15 -04:00
Mark Story
c4d57bd6e7 Removing AjaxHelper and JavascriptHelper as they were deprecated in 1.3 and are replaced by JsHelper + HtmlHelper. 2010-04-14 00:13:33 -04:00
Mark Story
958578c746 Fixing magic method visibility on Helper. 2010-04-13 23:54:21 -04:00
José Lorenzo Rodríguez
0300fc1c31 If connection is aborted, now MediaView returns false after stopping the transfer 2010-04-13 16:55:22 -04:30
José Lorenzo Rodríguez
940ce8b06e Adding some test coverage on MediaView.
Now MediaView does not exit after successful render, closes #569
2010-04-13 16:44:14 -04:30
Mariano Iglesias
388bca4acd Fixing syntax error generated by last merge conflict 2010-04-13 15:46:12 -03:00
Mariano Iglesias
a6b83cdd93 Fixing issue where TextHelper::autoLinkUrls was failing on some expressions 2010-04-13 15:39:30 -03:00
José Lorenzo Rodríguez
9d2819970d Fixing schema generation for postgres. Now character varying without lenght is translated to "text", to avoid sql errors. Closes #564 2010-04-13 01:08:31 -04:30
Mark Story
e2b5470d19 Updating version numbers to 1.3.0-RC4 2010-04-12 22:27:18 -04:00
ADmad
baaae6cdb7 Minor optimization in TreeBehavior::getparentnode() to avoid fetching unneeded associated records. Closes #572 2010-04-12 22:57:31 +05:30
Mark Story
404401b4de Moving action modification when a prefix is detected so it affects all url arrays. Previously it was only applied to parameters in the current request. This fixes inconsistencies between request parameters and url parameters. Fixes #570 2010-04-11 23:13:18 -04:00
Mark Story
42bc252460 Fixing return value of CakeSession::__startSession(). Once headers were sent any further session objects would think that the session was not successfully started. Fixes issues in Helper group test. Also fixes #568 2010-04-11 11:41:10 -04:00
predominant
a4cf737947 Fixing access specified on DboSource. 2010-04-11 15:25:18 +10:00
Mark Story
e1253f0bb5 Including a plugin short route for prefixes as well. There were failing Dispatcher tests relying on this. 2010-04-10 21:12:48 -04:00
ADmad
f6525e054f Updating transliteration map used by Inflector::slug to preserve some of the older mappings as previous commit broke test cases 2010-04-11 04:42:58 +05:30
Hilton Gonçalves
c082ee6b9b Update Default transliteration map used for Inflector::slug
Makes slugging of uppercase characters more consistent with lower case
ones.
Fixes #560
2010-04-10 18:09:54 -04:00
Mark Story
6c357ee555 Adding tests from 'tfs' fixes inconsistencies in extracting elements with one path selector. Fixes #555 2010-04-10 16:57:50 -04:00
Mark Story
fbaabad6bb Fixing issues where route parameters that overlapped could cause route compilation errors. Tests added. Fixes #565 2010-04-10 11:17:24 -04:00
Matt Curry
1c5898d94b Don't get User model if not needed. Fixes #563
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-10 10:40:56 -04:00
predominant
60bb9a9b56 Spacing doc blocks. 2010-04-09 22:06:44 +10:00
predominant
52cdef900b Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/dispatcher.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/tree.php
	cake/libs/router.php
	cake/tests/cases/libs/validation.test.php
2010-04-09 22:05:00 +10:00
predominant
ea635d6bea Fix protected call for _build on CakeSchema, and associated references. 2010-04-09 20:41:28 +10:00
Mark Story
30e6c57a96 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 23:37:27 -04:00
Mark Story
c38249ac28 Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.
Updating tests to reflect changes in behaviour. Fixes #244
2010-04-08 23:36:04 -04:00
predominant
59fb134455 Change private methods to specify access, and add proected on methods that missed mass updates. 2010-04-09 13:33:25 +10:00
predominant
19b66b8617 Change luhn validation to public. 2010-04-09 13:30:58 +10:00
predominant
1d39b93785 Change access modifier on _stop() to protected. 2010-04-09 13:24:23 +10:00
José Lorenzo Rodríguez
05af213d59 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3 2010-04-08 22:26:04 -04:30
sdoney
9f601ea334 Adding/Updating @link tags pointing to cookbook sections
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-08 22:46:05 -04:00
José Lorenzo Rodríguez
03e3c3249f Removing whitespace at the end of the file 2010-04-08 22:15:49 -04:30
José Lorenzo Rodríguez
7eb3055720 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding PluginShortRoute into default connected routes.  Fixes issues with the framework having built in 404s.
  Implementing PluginShortRoute and some tests for its methods.
  Fixing tests that started failing because of removal of short routes on reverse routing.
  Removing plugin shortcuts entirely.
  Adding additional test for plugin shortcut routes including prefixed shortcut routes.
  Updating doc block for Router::__connectDefaultRoutes()
  Removing Dispatcher::_restructureParams() as it is no longer used.
  Moving expectations inline.
  Fixing tests that should have never worked, and removing additional calls to _restructureParams.  Adding in prefixed plugin shortcuts as they were missing.
  Modifying Dispatcher tests to modify private variables (which is bad, but there is no way to change which plugins Router uses to create patterns).  This allows the removal of two calls to _restructureParams.
  Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests.
  Adding doc blocks to PluginShortRoute.  Adding PluginShortRoute into Router.
  Shrinking number of lines in dispatcher test case.
  Adding PluginShortRoute, and a few test cases.
2010-04-08 18:24:24 -04:30
José Lorenzo Rodríguez
59f7cb47d3 Improving test coverage on FormHelper to show the usage of the 'secure' key for inputs.
Fixing issue with select inputs that does not honor the value of 'secure'
2010-04-08 18:23:07 -04:30
Mark Story
4d780ee1f3 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-08 00:04:14 -04:00
Mark Story
0427fe9777 Merge branch 'no-shortcuts' into 1.3 2010-04-08 00:03:58 -04:00
Mark Story
81dc0d42b9 Adding PluginShortRoute into default connected routes. Fixes issues with the framework having built in 404s.
Adding tests for the default connected routes.
2010-04-08 00:03:46 -04:00
José Lorenzo Rodríguez
7668894888 Fixing error introduced by previous commit 2010-04-07 09:51:29 -04:30
Mark Story
131578cb42 Implementing PluginShortRoute and some tests for its methods. 2010-04-06 23:05:04 -04:00
predominant
e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/libs/shell.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
2010-04-06 12:19:34 +10:00
Mark Story
518cab91e5 Fixing discrepancy between how belongsTo and hasOne assocations are treated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379 2010-04-05 21:50:28 -04:00
predominant
51d71b4541 Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests. 2010-04-05 21:15:17 +10:00
predominant
34c7c1551f Added default constructor. 2010-04-05 17:30:24 +10:00
predominant
f5fa56ff3c Remove Overloadable from Helper class. 2010-04-05 16:45:14 +10:00
predominant
5f2d091810 Cleanup some whitespace. 2010-04-05 16:43:47 +10:00
predominant
e0534a7a70 Remove PHP4 code from dynamic call, and change call__ to __call. 2010-04-05 16:43:20 +10:00
predominant
b65395c155 Moved PHP5 Overloadable class to Overloadable. 2010-04-05 16:40:40 +10:00
predominant
57b52cf577 Fix access not being specified on certain methods in Helper. 2010-04-05 16:39:29 +10:00
predominant
34077c992b Removed PHP4 Overloadable class. 2010-04-05 15:03:07 +10:00
predominant
e05d670982 Remove PHP4 option in overloadable class include. 2010-04-05 13:24:24 +10:00
predominant
50a547167b Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
sdoney
dde52399ca Adding @link tags pointing to cookbook sections
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-04 22:09:49 -04:00
predominant
14b6a7ac5e Fixing access to private and protected variables in Xml class. 2010-04-05 08:57:40 +10:00
Mark Story
bdd8811924 Removing plugin shortcuts entirely. 2010-04-04 16:34:07 -04:00
José Lorenzo Rodríguez
45ccba5d94 Improving virtual fields fetching when the field wildcard selector * in present on the fields array, closes #524 2010-04-04 13:24:39 -04:30
predominant
3c2e7a091d Changed access to private __associations on Model to associations() calls. 2010-04-04 18:17:43 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
predominant
29dc12dbc2 Changed all $__ declared variables to private. 2010-04-04 16:33:39 +10:00
Mark Story
781af4a80c Updating doc block for Router::__connectDefaultRoutes() 2010-04-04 00:13:16 -04:00
Mark Story
ed60939292 Fixing tests that should have never worked, and removing additional calls to _restructureParams. Adding in prefixed plugin shortcuts as they were missing. 2010-04-03 23:32:14 -04:00
Mark Story
95802176bb Making PluginShortRoute check that the action exists before attempting to proceed. Updated tests. 2010-04-03 17:10:39 -04:00
Mark Story
a18d1be4c3 Adding doc blocks to PluginShortRoute. Adding PluginShortRoute into Router. 2010-04-03 16:54:41 -04:00
Mark Story
874c511fe2 Adding PluginShortRoute, and a few test cases. 2010-04-03 16:29:20 -04:00
Mark Story
558a9db642 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-04-02 15:51:00 -04:00
Mark Story
3503872ab8 Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 2010-04-02 15:50:43 -04:00
ADmad
1b8165d890 Enhancing email component to allow using alias for attachments. Closes #6 2010-04-03 00:37:02 +05:30
Mark Story
44b216cec3 Removing Model::$transaction as it did nothing. The property was added but never completed. Leaving the model property looking like it does something when in fact it does absolutely nothing. Refs #531 2010-04-02 13:53:53 -04:00
Nick Baker
3627f3b384 Patching dbo_mysql listDetailedSources. This fixes the broken test in dbo_mysql and solves ticket: 483-cakeshell-show-table-status-errors
Signed-off-by: Mark Story <mark@mark-story.com>
2010-04-02 13:21:22 -04:00
Mark Story
5b1e9f6f5f Fixing fatal error caused by Security class not being loaded When Session.start = false. Fixes #521 2010-03-30 21:40:29 -04:00
José Lorenzo Rodríguez
75900883e6 Making DboPostgres::value() return NULL when given an empty array, as DboMysql does 2010-03-30 00:01:33 -04:30
José Lorenzo Rodríguez
ebde29f63c Fixing error in las commit 2010-03-29 23:58:07 -04:30
José Lorenzo Rodríguez
bbf96567eb Using value() in default value generation with CakeSchema and DboPostgres 2010-03-29 23:50:40 -04:30
Mark Story
3f343e7874 Updating version numbers to 1.3.0-RC3 2010-03-28 19:13:49 -04:00
Mark Story
17852ab3aa Fixing failing tests in SessionHelper caused by changes in CakeSession. Removing SessionHelper::id() as all it did was call the parent method. 2010-03-28 17:41:58 -04:00
Mark Story
068631ebe2 Fixing AclNode::node() so that node expressions that could match deeper elements are contained to their parent elements. Test added. 2010-03-28 16:59:24 -04:00
Mark Story
46348e9bbd Adding and correcting doc blocks. 2010-03-28 12:53:57 -04:00
Mark Story
6c515739a1 Expanding documentation for Debugger. 2010-03-28 12:31:52 -04:00
Mark Story
bb941c2bc2 Adding documentation to IniAcl. 2010-03-28 12:20:02 -04:00
Mark Story
304a5ff64a Expanding documentation for AclComponent and DbAcl. 2010-03-28 12:17:53 -04:00
Mark Story
45730d1bca Updating more @link tags. 2010-03-28 11:34:58 -04:00
Mark Story
8ff0b536d8 Fixing @link tags and updating documentation for basics.php, Controller, and Dispatcher. 2010-03-28 11:28:03 -04:00
ADmad
d365fafe4d Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false 2010-03-28 05:29:42 +05:30
Mark Story
7b28fdec85 Fixing Security::cipher() not being able to correctly decrypt numeric values. Fixes #513 2010-03-27 17:19:42 -04:00
Mark Story
8ab5abe852 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 16:28:00 -04:00
Mark Story
35446a42a9 Making filtering of extracted arrays remember their key. This fixes attribute selectors followed by parent selectors returning seemingly random results. Fixes #502 2010-03-27 16:23:46 -04:00
Mark Story
3075eda8b6 Merge remote branch 'origin/1.2' into 1.3 2010-03-27 14:30:27 -04:00
Mark Story
b559be5822 Moving xml_parser_free() so parser resources are freed immediately after they are used. Helps reduce memory consumption in Xml class. Refs #505 2010-03-27 12:48:31 -04:00
Mark Story
0c29fd0094 Merge remote branch 'origin/1.2' into 1.3
Conflicts:
	cake/libs/cake_session.php
	cake/libs/controller/components/session.php
	cake/libs/model/model.php
	cake/libs/router.php
2010-03-27 11:48:49 -04:00
predominant
9ef5367219 Minor doc block spacing. 2010-03-26 22:53:30 +11:00
predominant
2decbc7129 Fix $host not being defined on SessionHelper. 2010-03-26 22:53:14 +11:00
predominant
abefca759a Fix $host not being defined on SessionHelper. 2010-03-26 22:51:58 +11:00
predominant
9da921d1d7 Space comment block away from code. 2010-03-26 22:47:20 +11:00
predominant
9bd0960cf1 Merge remote branch 'origin/1.3' into 1.3 2010-03-26 20:36:04 +11:00
predominant
0dfc07ba0d Fixes #53, ordering of XML::toArray() operations. 2010-03-26 20:30:17 +11:00
predominant
ec3f4b8d34 Fixes #53, ordering of XML::toArray() operations. 2010-03-26 19:59:09 +11:00
Mark Story
888fdd3dd5 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-25 23:44:53 -04:00
Mark Story
d20aa23711 Fixing issues where paths added to build() would be appended into the search paths after the default paths.
Fixed issue where paths added with build() would be lost when calling build() again to change a different path type.
Tests updated.
Fixes #410
2010-03-25 23:44:40 -04:00
predominant
5d3f0d7fe0 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:36:40 +11:00
predominant
13a55b6cd8 Fixes #332. 2010-03-26 14:35:35 +11:00
predominant
7b17374cad Refs #332. Beginning fix for multiple session starts. 2010-03-26 14:35:23 +11:00
predominant
9f5949ab52 Fix for Session Component to use CakeSession started() checks. Refs #332. 2010-03-26 14:29:27 +11:00
predominant
9740029e9e Fixes #332. 2010-03-26 14:21:08 +11:00
Mark Story
2e11f63bd4 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-03-25 23:02:05 -04:00
Mark Story
a72dabe257 Removing unnecessary variable assignment.
Removing unnecessary parenthesis.
2010-03-25 23:01:50 -04:00
predominant
d95e482894 Refs #332. Beginning fix for multiple session starts. 2010-03-26 10:46:48 +11:00
José Lorenzo Rodríguez
41734503a6 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Supporting Model.* syntax on postgres.
  Changing variable $title to $title_for_layout. Closes #511

Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-25 16:08:58 -04:30
José Lorenzo Rodríguez
1f1324f500 Qouting fields inside postgres functions when prepended a DISTINCT, closes #512 2010-03-25 16:05:45 -04:30
renan.saddam
dd4ad2f83d Supporting Model.* syntax on postgres. 2010-03-25 17:33:34 -03:00
ADmad
12e608c671 Changing variable $title to $title_for_layout. Closes #511 2010-03-26 01:03:48 +05:30
Mark Story
4f4d3f9ffe Fixing extraction of non-zero arrays with only one element and attribute selectors. Fixes #475 2010-03-24 23:25:02 -04:00
ADmad
209af202ec Optimizing Sanitize::html() by caching default charset. Closes #496. Also charset passed in $options parameter now takes precedence over the default value obtained from app's config value 'App.encoding' 2010-03-23 00:40:53 +05:30
Mark Story
817ebf5ec8 Merge remote branch 'ceeram/1.3-467' into 1.3 2010-03-21 20:41:54 -04:00
Mark Story
8f20b12c58 Expanding the documentation related to showParents and options. Fixes #479. 2010-03-20 19:43:52 -04:00
Juan Basso
5e8665cd8d Allowing routes to set an extension when Router::parseExtension() is
being used.  Fixes #492

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-20 19:23:48 -04:00
Mark Story
0cc1e4c56e Adding import for String to ensure that String has been loaded when Security component is used without making any database connections. Fixes #482 2010-03-20 18:18:24 -04:00
Mark Story
6c8ce984aa Adding import for String to ensure that String has been loaded when Security component is used without making any database connections. Fixes #482 2010-03-20 18:15:52 -04:00
ADmad
76af3b9e81 Fixing docblock for Inflector:rules() 2010-03-20 23:06:51 +05:30
Mark Story
d75e4b0d5f Updating documentation for Router::normalize(). Refs #486 2010-03-19 20:45:45 -04:00
Mark Story
45ef3c6151 Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-03-19 20:44:42 -04:00
Mark Story
f65cb31cbe Updating documentation for Router::normalize(). Refs #486 2010-03-19 20:44:18 -04:00
predominant
e595d81102 Removing returns from File::__construct 2010-03-19 14:10:10 +11:00
Ceeram
71e2fb533d fix for ticket #467 setting correct defaults when userModel is a plugin
model
2010-03-19 01:49:41 +01:00
ADmad
e2113e4aa2 Minor optimization in DboSource::__scrubQueryData(), removing unneded isset() check. 2010-03-18 03:02:58 +05:30
ADmad
6a723bb515 Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477 2010-03-18 02:51:55 +05:30
José Lorenzo Rodríguez
93ac79d4fb Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391 2010-03-17 16:45:39 -04:30
José Lorenzo Rodríguez
0f876e1a1b Merge branch 'saveAll' into 1.3
* saveAll:
  Making saveAll() behave like plain save() when suplied empty data array, closes #277
2010-03-17 16:40:26 -04:30
José Lorenzo Rodríguez
5c186d4430 Making saveAll() behave like plain save() when suplied empty data array, closes #277 2010-03-17 15:19:30 -04:30
José Lorenzo Rodríguez
c3aec39d75 Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391 2010-03-17 10:47:03 -04:30
José Lorenzo Rodríguez
28cb57a92c Fixing bug in Model::escapeField() where it would return the wrong string id the datasource's name method returs the unmodified string.
Tests added. Closes #473
2010-03-17 10:32:36 -04:30
AD7six
bc990f41e3 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-16 22:57:37 -04:00
José Lorenzo Rodríguez
c1f74c28ae Fixing postgres self join error 2010-03-16 16:49:57 -04:30
Mark Story
8375570f8a Removing useless loop in Model::save() 2010-03-15 23:36:20 -04:00
AD7six
0c951b7248 Prevent sql error for uuids if id is specified as null
if the primary key is present in the data to be saved as null - prevent
passing the same key (id) twice and therefore triggering an sql error.

Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-15 23:32:46 -04:00
Mark Story
4861da66ed Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-03-15 23:26:24 -04:00
Mark Story
01a5738f3c Effectively reverting changes made in
[190066fd51] which caused conditions using
a falsey values to be removed.
2010-03-15 23:14:23 -04:00
Mark Story
ea64588a81 Adding tests from 'Stephen Cuppert' to test incorrectly generate DELETE queries for habtm join tables that do not have a primary key when using PostgreSQL. Updating DboSource::_matchRecords() to only query the table if the supplied conditions are actually multi-table conditions. Fixes #459 2010-03-15 22:55:14 -04:00
Mark Story
190066fd51 Adding array_filter() to remove empty conditions that can be caused by array casting an empty string. 2010-03-15 22:15:03 -04:00
ADmad
cadac9c242 Minor optimization in Inflector::rules, using 'plus'(+) operator instead of 'array_merge' to merge transliteration map arrays 2010-03-16 00:35:05 +05:30
Mark Story
5e665b32f2 Removing useless condition in DboSource::cacheMethod() 2010-03-15 00:41:44 -04:00
Mark Story
daf02cad61 Fixing CakeSchema index comparison that was causing failures in postgres tests. 2010-03-14 23:31:52 -04:00
Mark Story
edf2ea1e74 Updating version numbers to 1.3.0-RC2 2010-03-14 16:44:54 -04:00
ADmad
70d0c64283 Removing constant REQUEST_MOBILE_UA, and added variable $mobileUA instead for mobile browser detection. Also added new user agent string 'webOS', closes #457 2010-03-15 01:58:38 +05:30
Mark Story
4c7b62bf64 Removing pre-beta deprecated method that was missed in last Release candidate 2010-03-14 16:07:29 -04:00
Mark Story
3d4b1e365d Removing deprecated method missed in last release candidate. 2010-03-14 16:06:31 -04:00
Mariano Iglesias
1120d0daff Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:37:50 -03:00
Mariano Iglesias
8d58b40642 Fixing issue in Containable where if bindModel was used to add / change a binding not permanently, Containable was making the change permanent 2010-03-14 16:34:57 -03:00
Mark Story
32432e8de6 Updating DboSource::conditions() to use cacheMethod(). Refs #458 2010-03-13 23:00:08 -05:00
Mark Story
c059cf5175 Implementing cacheMethod(). Helps to solve #458, as it provides features to control and clear method caches. 2010-03-13 22:55:18 -05:00
ADmad
688daf2c35 Allowing the default transliteration map used in Inflector::slug to be customized using Inflector::rules. Closes #321, #334, #439. 2010-03-14 02:22:46 +05:30
Mark Story
028668b7a6 Adding condition for counterCache update keys. Fixes issues where counter cache wouldn't be updated. Fixes #450 2010-03-13 00:18:51 -05:00
Mark Story
239e34f032 Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-03-10 21:49:55 -05:00
Mark Story
64c627a352 Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:49:22 -05:00
Mark Story
4c668c036c Adding checks to force limit to always be a positive integer. Fixes potential out of bounds type queries with paginate(). Fixes #418 2010-03-10 21:46:28 -05:00
José Lorenzo Rodríguez
d8a757ce75 Fixing empty value check to avoid a mistaken default value selection in Helper::value. closes #290 2010-03-10 15:16:02 -04:30
José Lorenzo Rodríguez
cbcd394d0b Fixing alter schema queries generated for Postgres, which dos not support altering column type, nullable and default value at the same time 2010-03-09 16:09:16 -04:30
Dieter Plaetinck
a79ff508a6 fix compliancy with more elaborate ORDER syntax, such as "DESC NULLS FIRST" in postgresql, in DboSource::order() 2010-03-09 14:12:54 -04:30
Mark Story
af317a107b Fixing issues in Set::combine() when data or paths used result in empty datasets. Tests added. Fixes #414 2010-03-08 23:07:36 -05:00
Mark Story
bed4027d37 Making JsHelper::writeBuffer() use the isAjax param to hint the domReady() event. Disabling domready events when the request isAjax fixes issues in prototype and makes output code simpler. Fixes #429 2010-03-08 22:51:46 -05:00
Mark Story
41bdc48fd3 Fixing whitespacing. 2010-03-08 22:49:09 -05:00
Mark Story
c874d98195 Minor refactor to use local variable. 2010-03-08 22:48:39 -05:00
predominant
2218d186c8 Revert "Fixing escaping of forward slash for JS Engines."
This reverts commit 7334fdfbdf.
2010-03-09 14:30:28 +11:00
predominant
7d81d81176 Merge remote branch 'origin/1.3' into 1.3 2010-03-09 12:28:06 +11:00
predominant
7334fdfbdf Fixing escaping of forward slash for JS Engines. 2010-03-09 12:26:25 +11:00
Mark Story
8216f5010c Fixing @see tags in JsEngines 2010-03-06 10:46:26 -05:00
Mark Story
63fcd225ac Fixing doc block @link tags in Model class. 2010-03-05 22:07:39 -05:00
Dieter Plaetinck
3affec58c6 move information about return value to the correct place in the doc block of Model::saveAll()
Signed-off-by: Mark Story <mark@mark-story.com>
2010-03-05 21:47:03 -05:00
Mark Story
af92276ba9 Adding missing reference operators to getInstance methods. 2010-03-05 21:41:48 -05:00
Mark Story
ba06b5b456 Moving call to _getConnectionObjects() inside class_exists check. Removes errors when creating a connection with no DATABASE_CONFIG class. 2010-03-05 21:37:28 -05:00
José Lorenzo Rodríguez
e4a5ca528c Fixing virutal fields fetching for postgresql, closes #417 2010-03-05 16:07:59 -04:30
Mark Story
1d449e3847 Refactoring label generation into a method.
Fixing issues with labels having a for attribute = Array when an array of id's is provided.
Fixing issues where a date input would require you to provide id keys for hour, minute, and meridian even if you were not using them.
Fixes #411
2010-03-04 22:46:43 -05:00
Mark Story
3e275494e1 Removing duplicated condition from merge. 2010-03-03 20:07:23 -05:00
predominant
382e11ccde Changed Configure::write to return true on success. Maked testing result simpler. 2010-03-04 10:20:15 +11:00
José Lorenzo Rodríguez
174108df19 Code cleanup, closes #416 2010-03-03 00:11:32 -04:30
hiromi2424
256ce41b1f LC_TIME support multi-byte value. 2010-03-02 23:51:22 -04:30
Mark Story
ee3c2efec7 Updating version number to 1.3.0-RC1 2010-02-28 20:48:26 -05:00
José Lorenzo Rodríguez
d5fa897681 Adding tests for startupProcess and shutDownProcess in controller
Fixing variable reference
2010-02-28 12:55:35 -04:30
ADmad
8dfadafc88 Changing ternary operator usage syntax to be compliant with php 5.2 and below 2010-02-28 13:05:00 +05:30
Mark Story
e0abe99d7d Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/libs/view/helpers/html.php
	cake/tests/cases/libs/folder.test.php
2010-02-28 01:58:29 -05:00
Mark Story
3f0c0d8848 Adding doc blocks for new methods. 2010-02-28 01:55:23 -05:00
Mark Story
37cf55470f Adding tests for Component::triggerCallback(). Deprecating other Component methods, as they are just wrappers for triggerCallback(). 2010-02-28 01:49:19 -05:00
Mark Story
70c4c05acd Merge branch '1.3-component' into 1.3 2010-02-28 01:39:54 -05:00
José Lorenzo Rodríguez
1f1e0f4ff7 Merge commit 'origin/1.3' into 1.3-form 2010-02-27 23:23:43 -04:30
José Lorenzo Rodríguez
b782563daf Adding test for form input templates 2010-02-27 23:18:21 -04:30
José Lorenzo Rodríguez
0ca5c11e6c Making the form helper put the "required" class on all imputs that have a validation rule and does not explicitly sets allowEmpty => true in validation array 2010-02-27 22:58:27 -04:30
Mark Story
cec6692123 Re-arrange the arguments of triggerCallback. Modifying Dispatcher so its not calling methods on Component directly. Additional methods added to Controller. 2010-02-27 22:01:08 -05:00
Mark Story
e75f6fe2b4 Refactoring existing callbacks into triggerCallback(). 2010-02-27 21:47:32 -05:00
Mark Story
ec5d9729b0 Model::find(first) no longer uses the id set in a model as the default conditions. Fixes #266 2010-02-27 11:32:29 -05:00
Mark Story
1f25bb31c0 Refactoring option extraction into a separate method. 2010-02-27 11:01:28 -05:00
Mark Story
3192e130af Fixing magic select creation for fields that have plural variables added to the view. 2010-02-27 11:01:28 -05:00
José Lorenzo Rodríguez
056b87d13a Implementing template for input formats, test pending 2010-02-26 18:39:33 -04:30
Mark Story
e4b392a4ff Updating and expanding form helper submit documentation. Refs #335 2010-02-24 22:58:09 -05:00
Mark Story
47afceea22 Expanding documentation for FormHelper::submit() Fixes #390 2010-02-24 22:54:48 -05:00
Mark Story
348fe6f574 Expanding documentation for FormHelper::submit() Fixes #390 2010-02-24 22:45:49 -05:00
José Lorenzo Rodríguez
6ae54fda8d Using the method cache for the rest of the return statements in DboSource::name 2010-02-23 10:09:11 -04:30
José Lorenzo Rodríguez
9a4de854d6 Improving the guessing process of required fields in the form helper.
Now it does not rely on the "required" property of the validation array anymore, which was misleading
2010-02-23 09:55:01 -04:30
Mark Story
753721c777 Making private properties and methods in FileEngine protected. Will make any possible subclasses easier to work with. 2010-02-22 23:36:47 -05:00
Mark Story
fbf054b22b Making FileEngine emit errors when a path does not exist but is used for caching. Should make cryptic errors coming from Cache easier to figure out. Removed useless private property.
Tests added.
Fixes #384
2010-02-22 23:21:30 -05:00
Mark Story
7075aa5e86 Fixing DboSource not quoting table/field names with - in them. Tests expanded . Fixes #323 2010-02-20 11:42:17 -05:00
Mark Story
763aa524b9 Fixing recursive directory creation when nested create() calls fail. Fixes #347 2010-02-20 11:25:46 -05:00
Mark Story
06fc87fc2d Fixing lack of space in meta tags lacking a link attribute.
Fixes #371
2010-02-20 01:41:56 -05:00
Mark Story
f4c670e5be Fixing lack of space in meta tags lacking a link attribute.
Fixes #371
2010-02-20 01:39:15 -05:00
Mark Story
6a3347ef7c Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/console/libs/tasks/model.php
	cake/dispatcher.php
	cake/libs/l10n.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
Mark Story
96bbbb2d72 Applying fixes made to JavascriptHelper to JsBaseEngine. 2010-02-17 22:27:52 -05:00
Mark Story
c7de42033c Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-17 22:23:16 -05:00
Mark Story
ab688b88f4 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:22:53 -05:00
Mark Story
2209f198f8 Adding test to check that postfix and prefix options don't go into inner objects. Tests added, fixes #348 2010-02-17 22:21:48 -05:00
renan.saddam
63f7900ba1 Checking if the last query returned a error, tests added. Fixes #72. 2010-02-17 22:31:00 -03:00
Mark Story
eb96f4ac3a Minor refactor of ConnectionManager::__connectionData(). Uses pluginSplit() now to consolidate plugin dot notation handling. 2010-02-16 22:42:06 -05:00
Mark Story
2279b1a736 Adding patches, and tests from tkykmw. Add support for plugin datasource drivers. Fixes #297 2010-02-16 22:35:16 -05:00
Mark Story
fc499ac48f Reversing order of short cut checks. Fixes issues in PHP 5.1.x. Fixes #351 2010-02-16 22:05:50 -05:00
Mark Story
e1eb827ee8 Merge branch 'configure-changes' into 1.3 2010-02-15 12:11:05 -05:00
renan.saddam
d7b49e3494 Not forcing the use of ds, so will use $useDbConfig instead, tests added. Fixes #324. 2010-02-15 14:46:18 -03:00
Mark Story
f04add4f79 Fixing querystring parameters being chopped off of absolute webroot asset paths. 2010-02-13 20:43:02 -05:00
Mark Story
dc8f49feda Modifying the bootstrap process, to match the documented changes. $pluginPaths style variables will no longer work. You need to use App::build() to set paths in the bootstrap file. Added a build() call before the bootstrap is included. This allows cold cache import() calls to work from bootstrap.php. 2010-02-13 19:39:11 -05:00
Mark Story
effbbeca33 Simplifying App::core() path generation. 2010-02-13 19:06:52 -05:00
Mark Story
a479f32da5 Clarifying the behaviour of FormHelper::button() fixes #335 2010-02-12 23:58:35 -05:00
Mark Story
46948dd2c0 Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329 2010-02-11 22:57:24 -05:00
Mark Story
0ce14ceb7e Adding return statement, preventing infinite loops when no default fields are bound, and unbindTranslation() is called with no fields. Fixes #307 2010-02-11 22:03:43 -05:00
Mark Story
3a03672379 Fixing formatting of code. 2010-02-09 21:05:01 -05:00
Mark Story
0fda18d11c Fixing entity encoding of url strings inside remoteFunctions contained in safe CDATA blocks. Fixes #127 2010-02-08 23:07:13 -05:00
Mark Story
b90a64c044 Adding Android and iPod as Mobile useragent names. Fixes #319 2010-02-08 21:11:56 -05:00
Mark Story
9edf2d1d80 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-02-07 16:45:55 -05:00
Mark Story
7384f56144 Fixing issues with old method names being used in EmailComponent. 2010-02-07 16:45:36 -05:00
ADmad
8c1c0e63c0 Allowing a html tag's attribute to be omitted from ouput by setting its value to null or false. Closes #316 2010-02-08 03:00:43 +05:30
Mark Story
6c3c5e9012 Merge remote branch 'rchavik/ticket_293' into 1.3
Conflicts:
	cake/libs/controller/components/email.php
2010-02-07 16:26:37 -05:00
ADmad
6f08d86c8e Links generated by PaginatorHelper::prev and PaginatorHelper::next are now wrapped in 'span' or the tag specified in options. Fixes #311 2010-02-07 23:56:50 +05:30
Mark Story
2cf294a749 Fixing typo in Finland for sv-fi language. Fixes #308 2010-02-06 14:30:39 -05:00
Mark Story
104da15a73 Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289 2010-02-06 14:20:56 -05:00
Mark Story
e6404f2d06 Making built-in Canadian postal code validation accept postal codes with no spaces. Fixes #289 2010-02-06 14:20:28 -05:00
Joël Perras
2c1e6de7d6 Another fix for array_values() throwing a warning when using Tree Behavior under certain
situations.
2010-02-05 13:18:46 -05:00
Mark Story
f389591085 Merge remote branch 'phally/1.3-email_component' into email-integration 2010-02-04 21:36:26 -05:00
rchavik
a20c809796 EmailComponent: Accept arrays for $to variable (closes #293) 2010-02-04 09:35:08 +07:00
Martin Radosta
447e953bd1 Add exact comparison to Debugger::checkSecurityKeys(). Fixes issues
with modifying the value by one digit.  Fixes #298

Signed-off-by: Mark Story <mark@mark-story.com>
2010-02-03 21:22:46 -05:00
Mark Story
4b269e3170 Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276 2010-02-02 20:39:33 -05:00
Mark Story
7daad4acaf Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00
Mark Story
2adac05dad Fixing RequestHandler::beforeRedirect() and issues with array urls, where incompatibilities between standard url arrays and requestAction url arrays caused incorrect results. Tests added. Fixes #276 2010-02-02 20:39:05 -05:00
Joël Perras
205c95ef65 Fix array_values() warning when using Tree Behavior under certain
situations.

In TreeBehavior::_setParent(), if the $Model->find('first') returned
false, then array_values() would throw a warning.
2010-02-02 11:48:57 -05:00
predominant
8d382d9168 Fixes #288. TextHelper truncation not playing nice with html in ending. 2010-02-02 09:13:52 +11:00
Juan Basso
a89d9e4830 Extra optimization for Set::diff(). Refer commit fde10b1. 2010-01-31 20:14:52 -04:30
ADmad
59a4732eb8 Fixing issue where value of '$and' was appended to output string even when list array contained only one element. Fixed #285 2010-01-31 23:43:58 +05:30
Mark Story
be7ddfb972 Updating version numbers to 1.2.6 2010-01-29 21:54:54 -05:00
Mark Story
7ac87d8543 Updating links on home.ctp to point at github and lighthouse. 2010-01-29 21:35:00 -05:00
José Lorenzo Rodríguez
3f9813a9ec Removing unused statement, thanks jrbasso 2010-01-29 16:15:03 -04:30
José Lorenzo Rodríguez
2e49a96634 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Adding file omitted from [30cb38eb93]
  Adding tests for deletion of multiple habtm associations.  Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records.  Fixes #247
2010-01-29 15:31:40 -04:30
José Lorenzo Rodríguez
fde10b1e62 Improving performance of Set::diff() 2010-01-29 15:31:07 -04:30
Mark Story
7fb7c5ebf6 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-29 11:56:09 -05:00
Mark Story
887ddb9575 Adding tests for deletion of multiple habtm associations. Reverting changes made in [15518b8c9a] that caused incorrect removal of links when deleting records. Fixes #247 2010-01-29 11:55:18 -05:00
Mark Story
7cfb5aba8d Minor refactor of Model::_deleteLinks to improve readability. 2010-01-29 11:21:37 -05:00
José Lorenzo Rodríguez
0abe9afc15 Merge branch '1.3' of git@github.com:cakephp/cakephp1x into 1.3
* '1.3' of git@github.com:cakephp/cakephp1x:
  Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready').  Tests updated.
2010-01-29 10:58:53 -04:30
José Lorenzo Rodríguez
1dd0a6470c Optimizations for DbouSource.
Now the result for some methods is stored in a memory cache inside the poperty $methodCache
2010-01-29 10:57:40 -04:30
Mark Story
832b15ba3e Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated. 2010-01-29 10:06:47 -05:00
Mark Story
38365924eb Removing deprecated and unused class property. 2010-01-28 13:30:55 -05:00
Mark Story
e8be5bac8d Expanding doc blocks for router::url. 2010-01-28 13:30:34 -05:00
Mark Story
30cb38eb93 Refactoring extensions in ScaffoldView to reflect removal of magic .thtml extension.
Adding test for interaction of Themed views and Scaffolded views.  Fixes #255
2010-01-28 11:11:19 -05:00
Mark Story
76d6864d90 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-28 10:55:41 -05:00
Mark Story
2b353e90f8 Minor optimizations in Router 2010-01-27 15:38:18 -05:00
ADmad
c9e047ce37 Adding 'orderYear' option for FormHelper::year to allow control over ordering of select options 2010-01-28 01:48:53 +05:30
Juan Basso
57997e770c Refactory of DboSource::name() to improve performance. Added more tests to it.
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-27 12:24:06 -05:00
Mark Story
4f67f84ff8 Merge branch '1.2' into 1.3-merger
Conflicts:
	app/config/acl.ini.php
	app/config/bootstrap.php
	app/config/core.php
	app/config/database.php.default
	app/config/inflections.php
	app/config/routes.php
	app/config/schema/db_acl.php
	app/config/schema/i18n.php
	app/config/schema/sessions.php
	app/config/sql/db_acl.sql
	app/config/sql/i18n.sql
	app/index.php
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	app/webroot/index.php
	app/webroot/js/vendors.php
	app/webroot/test.php
	cake/LICENSE.txt
	cake/basics.php
	cake/bootstrap.php
	cake/config/config.php
	cake/config/paths.php
	cake/config/unicode/casefolding/0080_00ff.php
	cake/config/unicode/casefolding/0100_017f.php
	cake/config/unicode/casefolding/0180_024F.php
	cake/config/unicode/casefolding/0250_02af.php
	cake/config/unicode/casefolding/0370_03ff.php
	cake/config/unicode/casefolding/0400_04ff.php
	cake/config/unicode/casefolding/0500_052f.php
	cake/config/unicode/casefolding/0530_058f.php
	cake/config/unicode/casefolding/1e00_1eff.php
	cake/config/unicode/casefolding/1f00_1fff.php
	cake/config/unicode/casefolding/2100_214f.php
	cake/config/unicode/casefolding/2150_218f.php
	cake/config/unicode/casefolding/2460_24ff.php
	cake/config/unicode/casefolding/2c00_2c5f.php
	cake/config/unicode/casefolding/2c60_2c7f.php
	cake/config/unicode/casefolding/2c80_2cff.php
	cake/config/unicode/casefolding/ff00_ffef.php
	cake/console/cake
	cake/console/cake.bat
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/api.php
	cake/console/libs/bake.php
	cake/console/libs/console.php
	cake/console/libs/i18n.php
	cake/console/libs/schema.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/db_config.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/tasks/test.php
	cake/console/libs/tasks/view.php
	cake/console/libs/templates/skel/config/bootstrap.php
	cake/console/libs/templates/skel/config/inflections.php
	cake/console/libs/templates/skel/config/sql/sessions.sql
	cake/console/libs/templates/skel/index.php
	cake/console/libs/templates/skel/views/elements/email/html/default.ctp
	cake/console/libs/templates/skel/views/elements/email/text/default.ctp
	cake/console/libs/templates/skel/views/layouts/ajax.ctp
	cake/console/libs/templates/skel/views/layouts/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
	cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
	cake/console/libs/templates/skel/webroot/js/vendors.php
	cake/console/libs/templates/skel/webroot/test.php
	cake/console/libs/templates/views/form.ctp
	cake/console/libs/templates/views/index.ctp
	cake/console/libs/testsuite.php
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/app_controller.php
	cake/console/templates/skel/app_helper.php
	cake/console/templates/skel/app_model.php
	cake/console/templates/skel/config/acl.ini.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/config/routes.php
	cake/console/templates/skel/config/schema/db_acl.php
	cake/console/templates/skel/config/schema/db_acl.sql
	cake/console/templates/skel/config/schema/i18n.php
	cake/console/templates/skel/config/schema/i18n.sql
	cake/console/templates/skel/config/schema/sessions.php
	cake/console/templates/skel/config/schema/sessions.sql
	cake/console/templates/skel/controllers/pages_controller.php
	cake/console/templates/skel/views/layouts/flash.ctp
	cake/console/templates/skel/webroot/css.php
	cake/console/templates/skel/webroot/css/cake.generic.css
	cake/console/templates/skel/webroot/index.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cache/apc.php
	cake/libs/cache/file.php
	cake/libs/cache/memcache.php
	cake/libs/cache/xcache.php
	cake/libs/cake_log.php
	cake/libs/cake_session.php
	cake/libs/cake_socket.php
	cake/libs/class_registry.php
	cake/libs/configure.php
	cake/libs/controller/app_controller.php
	cake/libs/controller/component.php
	cake/libs/controller/components/acl.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/cookie.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/components/session.php
	cake/libs/controller/controller.php
	cake/libs/controller/pages_controller.php
	cake/libs/controller/scaffold.php
	cake/libs/debugger.php
	cake/libs/error.php
	cake/libs/file.php
	cake/libs/flay.php
	cake/libs/folder.php
	cake/libs/http_socket.php
	cake/libs/i18n.php
	cake/libs/inflector.php
	cake/libs/l10n.php
	cake/libs/magic_db.php
	cake/libs/model/app_model.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/behaviors/containable.php
	cake/libs/model/behaviors/translate.php
	cake/libs/model/behaviors/tree.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/datasource.php
	cake/libs/model/datasources/dbo/dbo_adodb.php
	cake/libs/model/datasources/dbo/dbo_db2.php
	cake/libs/model/datasources/dbo/dbo_firebird.php
	cake/libs/model/datasources/dbo/dbo_mssql.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/datasources/dbo/dbo_odbc.php
	cake/libs/model/datasources/dbo/dbo_oracle.php
	cake/libs/model/datasources/dbo/dbo_postgres.php
	cake/libs/model/datasources/dbo/dbo_sqlite.php
	cake/libs/model/datasources/dbo/dbo_sybase.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/db_acl.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/multibyte.php
	cake/libs/object.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/sanitize.php
	cake/libs/security.php
	cake/libs/set.php
	cake/libs/string.php
	cake/libs/validation.php
	cake/libs/view/elements/dump.ctp
	cake/libs/view/elements/email/html/default.ctp
	cake/libs/view/elements/email/text/default.ctp
	cake/libs/view/errors/error404.ctp
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/app_helper.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/number.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/rss.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/text.php
	cake/libs/view/helpers/time.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/layouts/ajax.ctp
	cake/libs/view/layouts/default.ctp
	cake/libs/view/layouts/email/html/default.ctp
	cake/libs/view/layouts/email/text/default.ctp
	cake/libs/view/layouts/flash.ctp
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/theme.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/basics.test.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cache/file.test.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/cache/xcache.test.php
	cake/tests/cases/libs/cake_log.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_socket.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/class_registry.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/acl.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/security.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/controller_merge_vars.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/file.test.php
	cake/tests/cases/libs/flay.test.php
	cake/tests/cases/libs/folder.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/i18n.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/l10n.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/behaviors/containable.test.php
	cake/tests/cases/libs/model/behaviors/translate.test.php
	cake/tests/cases/libs/model/behaviors/tree.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/model/connection_manager.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/model/model.test.php
	cake/tests/cases/libs/model/model_behavior.test.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/model/model_integration.test.php
	cake/tests/cases/libs/model/model_read.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/multibyte.test.php
	cake/tests/cases/libs/object.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/sanitize.test.php
	cake/tests/cases/libs/security.test.php
	cake/tests/cases/libs/set.test.php
	cake/tests/cases/libs/string.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helper.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
	cake/tests/cases/libs/view/helpers/form.test.php
	cake/tests/cases/libs/view/helpers/html.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/cases/libs/view/helpers/number.test.php
	cake/tests/cases/libs/view/helpers/paginator.test.php
	cake/tests/cases/libs/view/helpers/rss.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
	cake/tests/cases/libs/view/helpers/time.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/account_fixture.php
	cake/tests/fixtures/aco_action_fixture.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/aco_two_fixture.php
	cake/tests/fixtures/advertisement_fixture.php
	cake/tests/fixtures/another_article_fixture.php
	cake/tests/fixtures/apple_fixture.php
	cake/tests/fixtures/aro_fixture.php
	cake/tests/fixtures/aro_two_fixture.php
	cake/tests/fixtures/aros_aco_fixture.php
	cake/tests/fixtures/aros_aco_two_fixture.php
	cake/tests/fixtures/article_featured_fixture.php
	cake/tests/fixtures/article_featureds_tags_fixture.php
	cake/tests/fixtures/article_fixture.php
	cake/tests/fixtures/articles_tag_fixture.php
	cake/tests/fixtures/attachment_fixture.php
	cake/tests/fixtures/auth_user_custom_field_fixture.php
	cake/tests/fixtures/auth_user_fixture.php
	cake/tests/fixtures/author_fixture.php
	cake/tests/fixtures/basket_fixture.php
	cake/tests/fixtures/bid_fixture.php
	cake/tests/fixtures/binary_test_fixture.php
	cake/tests/fixtures/book_fixture.php
	cake/tests/fixtures/cache_test_model_fixture.php
	cake/tests/fixtures/callback_fixture.php
	cake/tests/fixtures/category_fixture.php
	cake/tests/fixtures/category_thread_fixture.php
	cake/tests/fixtures/cd_fixture.php
	cake/tests/fixtures/comment_fixture.php
	cake/tests/fixtures/content_account_fixture.php
	cake/tests/fixtures/content_fixture.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
	cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
	cake/tests/fixtures/data_test_fixture.php
	cake/tests/fixtures/datatype_fixture.php
	cake/tests/fixtures/dependency_fixture.php
	cake/tests/fixtures/device_fixture.php
	cake/tests/fixtures/device_type_category_fixture.php
	cake/tests/fixtures/device_type_fixture.php
	cake/tests/fixtures/document_directory_fixture.php
	cake/tests/fixtures/document_fixture.php
	cake/tests/fixtures/exterior_type_category_fixture.php
	cake/tests/fixtures/feature_set_fixture.php
	cake/tests/fixtures/featured_fixture.php
	cake/tests/fixtures/film_file_fixture.php
	cake/tests/fixtures/flag_tree_fixture.php
	cake/tests/fixtures/fruit_fixture.php
	cake/tests/fixtures/fruits_uuid_tag_fixture.php
	cake/tests/fixtures/home_fixture.php
	cake/tests/fixtures/image_fixture.php
	cake/tests/fixtures/item_fixture.php
	cake/tests/fixtures/items_portfolio_fixture.php
	cake/tests/fixtures/join_a_b_fixture.php
	cake/tests/fixtures/join_a_c_fixture.php
	cake/tests/fixtures/join_a_fixture.php
	cake/tests/fixtures/join_b_fixture.php
	cake/tests/fixtures/join_c_fixture.php
	cake/tests/fixtures/join_thing_fixture.php
	cake/tests/fixtures/message_fixture.php
	cake/tests/fixtures/my_categories_my_products_fixture.php
	cake/tests/fixtures/my_categories_my_users_fixture.php
	cake/tests/fixtures/my_category_fixture.php
	cake/tests/fixtures/my_product_fixture.php
	cake/tests/fixtures/my_user_fixture.php
	cake/tests/fixtures/node_fixture.php
	cake/tests/fixtures/number_tree_fixture.php
	cake/tests/fixtures/number_tree_two_fixture.php
	cake/tests/fixtures/numeric_article_fixture.php
	cake/tests/fixtures/overall_favorite_fixture.php
	cake/tests/fixtures/person_fixture.php
	cake/tests/fixtures/portfolio_fixture.php
	cake/tests/fixtures/post_fixture.php
	cake/tests/fixtures/posts_tag_fixture.php
	cake/tests/fixtures/primary_model_fixture.php
	cake/tests/fixtures/product_fixture.php
	cake/tests/fixtures/project_fixture.php
	cake/tests/fixtures/sample_fixture.php
	cake/tests/fixtures/secondary_model_fixture.php
	cake/tests/fixtures/session_fixture.php
	cake/tests/fixtures/something_else_fixture.php
	cake/tests/fixtures/something_fixture.php
	cake/tests/fixtures/stories_tag_fixture.php
	cake/tests/fixtures/story_fixture.php
	cake/tests/fixtures/syfile_fixture.php
	cake/tests/fixtures/tag_fixture.php
	cake/tests/fixtures/test_plugin_article_fixture.php
	cake/tests/fixtures/test_plugin_comment_fixture.php
	cake/tests/fixtures/the_paper_monkies_fixture.php
	cake/tests/fixtures/thread_fixture.php
	cake/tests/fixtures/translate_article_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/fixtures/translate_table_fixture.php
	cake/tests/fixtures/translated_article_fixture.php
	cake/tests/fixtures/translated_item_fixture.php
	cake/tests/fixtures/unconventional_tree_fixture.php
	cake/tests/fixtures/underscore_field_fixture.php
	cake/tests/fixtures/user_fixture.php
	cake/tests/fixtures/uuid_fixture.php
	cake/tests/fixtures/uuid_tag_fixture.php
	cake/tests/fixtures/uuid_tree_fixture.php
	cake/tests/fixtures/uuiditem_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
	cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
	cake/tests/fixtures/uuidportfolio_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_reporter.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_fixture.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/cli_reporter.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/templates/footer.php
	cake/tests/lib/templates/header.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/lib/xdebug.php
	cake/tests/test_app/config/acl.ini.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/controllers/tests_apps_posts_controller.php
	cake/tests/test_app/models/behaviors/persister_one_behavior.php
	cake/tests/test_app/models/behaviors/persister_two_behavior.php
	cake/tests/test_app/models/comment.php
	cake/tests/test_app/models/persister_one.php
	cake/tests/test_app/models/persister_two.php
	cake/tests/test_app/models/post.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
	cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/html/default.ctp
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/elements/email/text/wide.ctp
	cake/tests/test_app/views/layouts/ajax.ctp
	cake/tests/test_app/views/layouts/ajax2.ctp
	cake/tests/test_app/views/layouts/cache_layout.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/layouts/email/html/default.ctp
	cake/tests/test_app/views/layouts/email/html/thin.ctp
	cake/tests/test_app/views/layouts/email/text/default.ctp
	cake/tests/test_app/views/layouts/flash.ctp
	cake/tests/test_app/views/layouts/multi_cache.ctp
	cake/tests/test_app/views/posts/sequencial_nocache.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc Fixing @link tags to ease merging. 2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Mark Story
3a1b0924c4 Additional doc tag fixes for Router. 2010-01-26 14:10:58 -05:00
Mark Story
fc304056a3 Removing Session deletion of nonce token on blackhole. Fixes possible CSRF risk from multiple submissions of the same invalid data. Refs #214 2010-01-26 13:59:26 -05:00
Mark Story
c195d654b3 Fixing TranslateBehavior test to run in php4. 2010-01-26 11:00:37 -05:00
Mark Story
9cbb9d193a Fixing php4 compatibility and errors from array to string conversion. 2010-01-26 10:55:11 -05:00
Robust Solution
16eaa990df optimization in AuthComponent class startup method
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-26 10:13:09 -05:00
Mark Story
b1a0eb1097 Fixing double DS when requiring cache engines. Fixes #254 2010-01-26 10:10:22 -05:00
Mark Story
c2e7e5642e Updating doc blocks for View and Theme View. 2010-01-25 18:14:16 -05:00
Mark Story
a77a064164 Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences. 2010-01-25 17:59:05 -05:00
Mark Story
134ce68dce Updating and correct doc blocks for lib classes.
Removing unused private property in Router.
2010-01-25 15:37:55 -05:00
Mark Story
38eac37bb1 Removing optional group flag for routed parameters. Fixes issues with trailing empty route parameters. Tests added for correct parsing of these routes. Fixes #252 2010-01-25 12:49:12 -05:00
Mark Story
f6d12dbde6 Adding support for CURRENT_TIMESTAMP to all dbo's. 2010-01-25 12:25:14 -05:00
Mark Story
59319b098b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:20:05 -05:00
Mark Story
98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
	cake/libs/folder.php
2010-01-25 11:18:44 -05:00
Mark Story
7459da2aff Updating doc blocks for HttpSocket and File. 2010-01-25 11:18:44 -05:00
Mark Story
b33fdba6d9 Updating doc blocks on Folder class and implementing a few small refactors to make code simpler. 2010-01-25 11:18:33 -05:00
José Lorenzo Rodríguez
9c24c72db3 Fixing regression introduced in commit c2d19c2011, closes #258 2010-01-25 09:06:06 -04:30
José Lorenzo Rodríguez
03200440ed Fixing TranslateBehavior and $tablePrefix. Closes #168 2010-01-24 18:27:08 -04:30
Phally
3c265283e7 Added support for Message-ID headers. 2010-01-24 23:29:53 +01:00
José Lorenzo Rodríguez
c2d19c2011 Various Optimizations, thanks jrbasso. Closes #232 2010-01-23 22:33:53 -04:30
Mark Story
23a62b488b Updating and expanding documentation blocks in Dispatcher and CakeLog. 2010-01-22 18:11:49 -05:00
Mark Story
1877281cd8 Expanding doc blocks for Cache. 2010-01-22 17:54:28 -05:00
Juan Basso
ad496cea18 Optimized Security::cipher(). Fixes #176
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-22 15:34:02 -05:00
Mark Story
5d35fd8d38 Fixing issues in DboSource::defaultConditions() and DboSource::conditions() where doubly deleting a record from the beforeDelete and delete() could create incorrect conditions that would delete all records in a table. Fixes #250 2010-01-22 10:30:22 -05:00
Mark Story
1cfd273052 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 15:44:53 -05:00
Mark Story
f4e837d985 Removing all methods currently issuing warnings about being deprecated. 2010-01-21 15:14:23 -05:00
José Lorenzo Rodríguez
e77ed92646 Merge branch '1.3-cache' into 1.3
* 1.3-cache:
  Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
  Removing php5 visibility keywords.
  Fixing various errors related to Cache::increment() and Cache::decrement().
  Removing test ignore
  Adding atomic increment and decrement methods to cache engines, closes #234
2010-01-21 14:57:07 -04:30
Mark Story
513db9a72a Removing repeated checks, as they've been refactored into Cache::increment() and Cache::decrement().
Adding skipIf()'s to ApcEngineTest in case apc_inc, and apc_dec are not available.
2010-01-21 14:14:26 -05:00
Mark Story
47c7387548 Fixing various errors related to Cache::increment() and Cache::decrement().
Removing php5 only keywords from test cases.
Updating memcache tests, to correctly skip multiple server test when multiple memcached servers cannot be found.
2010-01-21 13:57:42 -05:00
Mark Story
2d3cde1abb Updating doc block for ConnectionManager and including note about possible PHP4 issues. 2010-01-21 13:18:00 -05:00
Juan Basso
b21538c426 Getting a list of connections in the constructor of ConnectionManager
class. Fixes issues where using ConnectionManager::create() before the
standard connections are enumerated will result in the standard
connections never being enumerated.  Fixes #206

Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-21 12:59:00 -05:00
Mark Story
2915493049 Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 2010-01-21 12:00:04 -05:00
Mark Story
c5a5d1dfe6 Making Session.model the required setting and not Session.table. Session.table can still be used to set the table name used when configuring sessions, but the default value is cake_session as before. Fixes #223 2010-01-21 11:59:49 -05:00
José Lorenzo Rodríguez
dff7e17fa2 Adding atomic increment and decrement methods to cache engines, closes #234 2010-01-21 12:11:44 -04:30
ADmad
a8040506b0 Fixing spacing between button tag attributes. Fixes #241 2010-01-21 22:03:03 +05:30
Mark Story
913450daef Additional tests for virtualFields and fixing issues with index 0 being removed. Fixes #208 2010-01-21 10:35:20 -05:00
Phally
984dc50f37 Merge commit 'upstream/1.3' into 1.3-email_component 2010-01-21 00:05:03 +01:00
Mark Story
ae4a31f070 Making DEFAULT_LANGUAGE also set $language var which sets Config.language to a correct value. Fixes #228 2010-01-20 14:33:37 -05:00
Juan Basso
c4afeb3fe6 Minor optimization on datasource and Mysql[i]. 2010-01-20 01:44:59 -04:30
Juan Basso
e328043586 Minor optimization in helper. No need cast, always is array. 2010-01-20 01:41:43 -04:30
Juan Basso
8d5acf0706 Infector::_cache is a protected method and no need be singleton. 2010-01-20 01:39:36 -04:30
Juan Basso
d2d19eeda4 Fixing import in CakeSession. 2010-01-20 01:06:34 -04:30
José Lorenzo Rodríguez
96fd0bf100 Fixing error introduced in previous commit due to bad merge 2010-01-19 16:44:43 -04:30
ADmad
22073e3376 Renaming Configure var 'Security.cipher_seed' to 'Security.cipherSeed'. Also added a srand() call at end of Security::cipher function to reset seed. Closes #73 , #183 , #218 2010-01-20 01:23:20 +05:30
renan.saddam
39dd15d3f6 Removing the with key from otherFields array, also fixing the page title. Tests added. 2010-01-19 14:05:29 -02:00