Commit graph

217 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
69b70249da Fixing more issues with database prefixes 2011-02-24 01:31:03 -04:30
mark_story
ef77e60cb0 Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
2010-12-24 14:09:57 -05:00
mark_story
48879f8264 Fixing strict errors in translate and acl behaviors.
Removing conditional definition of I18nModel.  There is no reason for it to exist anymore.
Removing duplicate class definition.
2010-12-12 17:38:49 -05:00
mark_story
df21d19c4c Making a bunch of properties public so containable can hack around. Need to refactor and fix visibility issues.
Fixing failing tests in containable.
2010-12-12 15:48:36 -05:00
mark_story
81e009b816 Fixing additional strict warnings. 2010-12-12 15:02:38 -05:00
mark_story
33b8a35b75 Fixing strict warnings in TreeBehavior and a few other classes. 2010-12-12 14:56:48 -05:00
José Lorenzo Rodríguez
c559b9c22d Merge remote branch 'origin/2.0' into 2.0
Conflicts:
	cake/console/templates/skel/config/database.php.default
	cake/libs/model/datasources/dbo/dbo_sqlite.php
2010-12-05 20:51:37 -04:30
Juan Basso
c52d5320c8 Replaced the *printf with i18n aliases by i18n aliases with params. 2010-12-04 23:37:13 -02:00
José Lorenzo Rodríguez
0d93520e0a Fixing test case for sqlite 2010-11-29 20:52:32 -04:30
José Lorenzo Rodríguez
f2b707ac0b Merge remote branch 'origin/2.0' into feature/2.0/pdo
Conflicts:
	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_source.test.php
2010-11-16 21:54:42 -04:30
mark_story
18bb5f6b8b Removing =& operators for construction of objects. 2010-11-12 23:05:44 -05:00
José Lorenzo Rodríguez
ce490b1df2 Fixing issues with translatable field aliasing in TranslateBehavior 2010-10-26 18:22:13 -04:30
José Lorenzo Rodríguez
9f27fa7dfb Fixing parsing of translated data after switching to virtualFields 2010-10-26 17:52:40 -04:30
José Lorenzo Rodríguez
02635696d7 Removing function from created virtual fields in translate behavior as it was not needed 2010-10-26 17:51:29 -04:30
José Lorenzo Rodríguez
90274ef859 restoring commented code to make more tests pass 2010-10-26 17:50:37 -04:30
José Lorenzo Rodríguez
e989f71b99 making a backup of model virtual fields in traslate behavrio to avoid side effects 2010-10-26 17:49:43 -04:30
José Lorenzo Rodríguez
f94f79e146 Initial steps to start using virtual fields in TranslateBehavior, this will ease Dbo abstraction 2010-10-25 23:40:24 -04:30
José Lorenzo Rodríguez
122cb1ec5b Removing mor assignments by reference 2010-10-17 18:58:03 -04:30
mark_story
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
Mark Story
d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
dogmatic69
95168cee6e casting the find as an array to avoid errors with array_values() fixes #1041 and 4 failing tests (3 previous)
Signed-off-by: mark_story <mark@mark-story.com>
2010-08-26 20:32:48 -04:00
mark_story
c4a978d386 Adding changes missed in the merge. 2010-08-15 23:10:29 -04:00
mark_story
705e90bef7 Merge branch '1.3' into 2.0-merge
Conflicts:
	cake/libs/cache/memcache.php
	cake/libs/cake_session.php
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cake_test_fixture.test.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
2010-08-15 23:09:02 -04:00
mark_story
509a9e14e2 Fixing condition missing a model name in the TreeBehavior. Fixes #961 2010-07-31 14:29:00 -04:00
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
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
b8085cddce Removing PHP5 and all its uses. 2010-07-05 22:19:22 -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
mark_story
e5df32e9d9 Adding omitted documentation information. 2010-06-10 14:23:49 -04:00
predominant
8decc683ac Numerous 'shoer description' documentation entries updated to contain useful comments. 2010-05-30 01:20:28 +10: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
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
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
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
6bd9f0f05b Convert models, datasources and file/folders to new version of translation shortcut function. 2010-04-16 02:00:25 +10:00
ADmad
baaae6cdb7 Minor optimization in TreeBehavior::getparentnode() to avoid fetching unneeded associated records. Closes #572 2010-04-12 22:57:31 +05:30
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
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
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
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
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
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
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
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
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