mark_story
7259a1b920
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/text.php
cake/libs/view/theme.php
2009-12-06 21:43:53 -05:00
mark_story
6046528744
Moving XmlNode::__killParent() to a protected method so Xml can access it. Adding _killParent(true) call to Xml::__destruct. Forces destruction of circular references held in child objects when an xml object is garbage collected. Fixes #369
2009-12-01 10:01:36 -05:00
mark_story
26aa3731e0
Fixing _name_ elements being inserted into serialized xml from Xml lib. Test case added. Fixes #367
2009-11-27 14:27:32 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
mark_story
a96c157d94
Applying optimizations to use of count() from 'jrbasso'
2009-11-21 15:14:21 -05:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
d1f5acd0e0
Merge commit 'origin/1.2' into 1.2-merge-in
...
Conflicts:
cake/console/libs/shell.php
cake/libs/model/connection_manager.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/groups/database.group.php
2009-10-14 00:51:55 -04:00
renan.saddam
7116c01642
Fixing Xml::toArray() when blank nodes are provided. Fixes #87 .
2009-09-22 17:58:12 -03:00
renan.saddam
42fac9ec71
Fixing Xml::toArray() when blank nodes are provided. Fixes #87 .
2009-09-22 17:47:11 -03:00
renan.saddam
317049b736
Fixing bug when value is '0', it was generating a blank node.
2009-09-17 23:08:32 -03:00
mark_story
326424592d
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/libs/inflector.php
cake/libs/view/view.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
mark_story
5a971ddbf0
Fixing Xml::toArray() Where camelcased data was collapsed and corrupted. Causing unpredictable data structures with empty tags. Minor changes to existing behavior. See modified test cases. Fixes #8
2009-08-13 22:47:17 -04:00
mark_story
ab50bbe595
Cleaning up doc blocks.
...
Removing commented out code.
Removing use of a()
2009-08-13 21:29:33 -04:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07:00
gwoo
9e1dec3ff3
fixes #6538 , xml serialization on multi dimensional
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8264 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 01:50:14 +00:00
AD7six
b2142df2bc
adding a newline before all comment blocks
2009-07-24 21:18:37 +02:00
mark_story
975e4452d2
Fixing Xml parsing where multiple child elements of the same name, with no value are collapsed causing data errors when Xml object was converted to an array. Test cases from 'burzum' added.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8209 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-01 18:58:05 +00:00
mark_story
fd7cf5e5e6
Adding test cases for boolean and boolean-ish values. Fixes false being converted to '' when using Xml::toString().
...
Fixes #6478
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8206 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-30 01:14:20 +00:00
nate
9f15226e46
Fixes #6318 : Incorrect whitespace handling/parsing of XML documents
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8158 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-28 13:23:37 +00:00
davidpersson
bbfee7ba17
Updating Xml class to always use #document as the very root node and to create a node below it if the root option is set.
...
Adding test.
Fixes #6294
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8147 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-17 13:26:07 +00:00
nate
92cc331341
Updating docblocks and code formatting in XML classes, adding test change to previous commit.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8089 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-11 04:09:35 +00:00
phpnut
92e04703b7
Adding ability to turn off Camel Casing of nodes in Xml::toArray();
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7894 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-26 18:21:21 +00:00
renan.saddam
6319f8ea69
Removed trailing whitespaces from core.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
mark_story
1b456f2cf1
Applying patch from 'davidpersson' fixing code spacing. Closes #5643
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7772 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-23 00:10:44 +00:00
nate
34c5f74300
Changing handling of numeric node values in Xml class, fixes #5520
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7700 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-04 19:50:38 +00:00
mark_story
0f9a4e0470
Optimizing in_array() checks to isset().
...
No more in_array($a, array_keys($b)) patterns exist.
Closes #5161
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7624 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-18 03:40:28 +00:00
gwoo
06ee84a128
fixes #5429 , Xml::toString() quotes
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7607 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-15 11:50:51 +00:00
phpnut
cb487bd6e6
More optimization refactoring.
...
Fix cache but causing object_map to be created and deleted on each request.
Replacing function and method calls with better performing code.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7596 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-12 05:11:34 +00:00
TommyO
5014b9d330
Found bug where mulitple instances of mulitple nodes within the same parent node caused conflicts in toArray(). Added test and fix.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7557 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-05 17:20:18 +00:00
gwoo
2a84ec9944
fixes #5384 , Xml::toArray()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7555 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-09-04 15:34:08 +00:00
mark_story
7e039ee62d
Adding additional tests to XML.
...
Added XML group, updated RssHelper and XmlHelper tests to not cause issue when run as part of a group.
Updated assertions on helper test.
Fixed broken methods in XML
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7514 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 23:15:48 +00:00
gwoo
59efe5c445
fixes #5209 , appending node in Xml. Adds more test coverage form Xml class and adds removeNamespace for convenience.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7505 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-26 01:18:15 +00:00
gwoo
fb3eb24a0d
fix for xml::toArray to allow any node to use it
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7450 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-10 16:26:43 +00:00
nate
0119c0d46f
Fixing HTML entity escaping in helpers, fixing broken XmlHelper test, all helper tests now passing
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7403 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-08-01 04:53:16 +00:00
gwoo
b0d2451a97
removing optional instantiation of Set class. Adding toArray() to xml class and calling it from Set::reverse(); updated test cases.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7398 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 23:50:32 +00:00
gwoo
38bbfb66ce
fixes #4976 , escape chars in attributes of xml tags
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7253 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-24 01:38:40 +00:00
gwoo
42db64bbb3
fixes #4778 , rss helper addNs, closes #4949 xml helper serialize with test case
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7227 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-21 15:23:58 +00:00
TommyO
eaf4dc9ff5
Rework of Xml class to better handle namespaces. closes #4760
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7107 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-03 18:41:04 +00:00
nate
42da5aba81
Moving Cake folder to correct location
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00