Commit graph

60 commits

Author SHA1 Message Date
Mark Story
7daad4acaf Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2 2010-02-02 20:39:25 -05:00
predominant
8d382d9168 Fixes #288. TextHelper truncation not playing nice with html in ending. 2010-02-02 09:13:52 +11:00
Mark Story
66a8910810 Fixing cakephp domain name. 2010-01-26 17:15:15 -05:00
Mark Story
527eec1a54 Fixing doc tags to make merge easier. 2010-01-26 16:51:53 -05:00
Joël Perras
15b8a3ec71 Updating copyright date on all files. 2010-01-13 23:47:14 -05:00
dogmatic
51d0805ce0 fixes Text::toList to allow passing array( 1=>"abc", 2=>"abc" ) and the updated test case
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-24 20:23:23 -05:00
DarkAngelBGE
fefbe77208 Minor refactorings for DboMysql, DboSource and TextHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +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
mariano.iglesias
8da2a5208f Adding multibyte support to TextHelper::truncate, fixes #5610
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7842 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:07:17 +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
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
mark_story
4355a13939 Altered TextHelper::truncate() when using exact = false and considerHtml = true close tags would be chopped off leaving incorrect Html. Closes #4941
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7342 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-16 12:40:49 +00:00
gwoo
1e231e9511 some cleanup, wrapping uses() in class exists
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7172 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 15:46:31 +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
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
the_undefined
0053b162a8 Converted spaces to tabs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6953 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 06:55:17 +00:00
the_undefined
3204ced2ed Made TextHelper::highlight utf8 compatible, fixes #4602
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6952 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 06:54:53 +00:00
joelmoss
64e68c9b7c Text helper highlight method now handles HTML tags correctly. Closes #2242
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6912 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 18:45:24 +00:00
the_undefined
93ad951a8c Fixed small bug in TextHelper::autoLinkUrls, closes #4357
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6832 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 03:53:26 +00:00
nate
81b57b7d5d Pushing TextHelper code coverage to 100%
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6816 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-12 07:05:33 +00:00
nate
66e1efbcdb Deprecating TextHelper::flay(), fixes #3052
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6815 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-12 06:46:58 +00:00
joelmoss
a0af56f923 Removing inline comments
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6712 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-23 13:58:26 +00:00
joelmoss
8fa2d1cf9c Added tests for TextHelper::truncate. Truncate now also fully respects HTML tags and characters if $considerHtml is passed and true. The third parameter of truncate can now also be an array consisting of any of the remaining params.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6711 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-23 13:23:12 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
8a2b51c3ec "Removing all shortcut function usage from the core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
gwoo
072495f5e1 updating TextHelper::autoLinkUrls(), fixes #3597
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6043 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-22 05:36:20 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440 Correcting @return int
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
phpnut
1704efa50a Fixes #3419, $text->autoLink does not preserve existing links
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5836 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-21 22:21:28 +00:00
mariano.iglesias
3eaa019625 Small typo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5618 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-06 05:41:54 +00:00
mariano.iglesias
a798cd3dbb Adding some documentation tags. Fixing issue with stripLinks not properly removing multiple links. Making excerpt and autoLinkUrls case insensitive. Adding some tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5617 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-06 05:28:36 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
gwoo
624e02374a adding and to TextHelper::toList #1934
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5177 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 22:55:05 +00:00
dho
35c7807cc3 Case-insensitive matching when using array of phrases in TextHelper::highlight
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4878 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-21 16:55:09 +00:00
dho
ee403daf5d Fixing problem with highlighting multiple phrases (ticket #2418)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-13 14:27:59 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
phpnut
1aef0e1f72 Adding fix for #1908
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4379 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 04:02:43 +00:00
phpnut
b36dc55327 Adding fix for #1953
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4359 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 21:05:51 +00:00
nate
18f086fbd1 Updating TextHelper::autoLinkEmails() with new API changes (Ticket #1874)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4266 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-06 21:10:33 +00:00
nate
11d5b0fa7b Removing extra directory separators in uses() paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3953 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 04:31:26 +00:00
nate
de52eb88c9 Updating helper class hierarchy, and adding 1.2 fix for Ticket #1569
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3750 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:40:34 +00:00
nate
81679cc123 Adding fix for Ticket #1468
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3608 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-08 15:30:58 +00:00
nate
d783b537e5 Removing reference to HtmlHelper::linkOut in TextHelper::autoLinkUrls (Ticket #1468)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3592 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 23:54:06 +00:00
phpnut
6675bf9e62 Adding fix for #1302
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3492 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-15 00:36:35 +00:00
nate
39c32d0454 Adding default parameter for TextHelper::truncate
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3466 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 18:01:00 +00:00
nate
26977195c3 Fixing class name reference in TextHelper ('Html' -> 'HtmlHelper')
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3370 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-06 17:55:01 +00:00
nate
1dc6c1128b Adding TextHelper::toList(), to create natural-language lists from arrays
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3304 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 04:20:30 +00:00
nate
c50275de24 Cleaning up TextHelper code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3303 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 04:12:24 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00