Ingo Schommer
f18136c130
MINOR Removed debug code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@82202 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Sean Harvey
5ffd79cb79
BUGFIX Fixed double up of <span> highlight tags around keywords in Text::ContextSummary()
...
MINOR Added test for Text::ContextSummary()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@82035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Will Rossiter
6b35a34f91
e:
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Will Rossiter
5fd91c426d
MINOR: merged r81467 from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81971 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Will Rossiter
261c976435
ENHANCEMENT: Updated Versioned::compareVersions() to use DataDifferencer. Merged from trunk r77660
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81933 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Ingo Schommer
004ff37700
MINOR PHP notice in MySQLDatabase (partial merge from r77160)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Sean Harvey
092108115d
BUGFIX Convert::recursiveXMLToArray() did not always check if the passed in XML is an object before calling get_class() on it
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Sean Harvey
b2374aabe6
BUGFIX Merged in PHP 5.3 bugfixes from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Sam Minnee
6394679b29
BUGFIX #4285 : Fixed static application bug that appeared in 2.3.2
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Sam Minnee
1d31b59b24
ENHANCEMENT: Improvements to DataDifferencer for cmsworkflow.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Sam Minnee
762351263e
BUGFIX: Relax type checking in RequestHandler::checkAccessAction()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81262 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Will Rossiter
ad3349ccc9
BUGFIX: prevented cms from dying when a page has no published children. Added check before stepping into the loop
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@81050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:30 +13:00
Ingo Schommer
3edc596bdb
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@79282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:29 +13:00
Ingo Schommer
059d05bae4
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@79211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:29 +13:00
Ingo Schommer
641c565353
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@79195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:29 +13:00
Hamish Friedlander
98a75735ee
MINOR: Tests for previous HTMLText#Summary and HTMLText#FirstSentence patch
...
BUGFIX: A couple of bugfixes on HTMLText#Summary and HTMLText#FirstSentence so the trickiest tests pass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:29 +13:00
Sam Minnee
8aea22c283
API CHANGE: Added increase_memory_limit_to() for increasing but not decreasing memory limit.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:29 +13:00
Hamish Friedlander
f74069f060
BUGFIX: Replace HTMLText#Summary with one that works.
...
API CHANGE: Added two arguments to HTMLText#Summary. Minimal impact since previously any usage of this function threw an error.
ENHANCEMENT: Add HTMLText#FirstSentence based on new HTMLText#Summary
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
b38315bdba
BUGFIX: Don't allow the use of get-var ?isDev=1 when security DB isn't available.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
d558394ed5
BUGFIX: Fix readonly versions of grant fields.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Ingo Schommer
144a4e4d83
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
118cfc6ac0
BUGFIX: Changing from unset record entry to an empty value shouldn't register as a 'level 2' change
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
9ff7f26b0e
BUGFIX: Fixed bugs in previous change to DOD
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
3cbf9ae73b
BUGFIX: Fix edge-case bug with application of decorators
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
e72e9a6d88
BUGFIX #4113 : Fixed bugs with template processing in i18nTextCollectorTask.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
8b3a9c685f
BUGFIX #4119 netminds: Fix error page publication for lang to locate replacement.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Saophalkun Ponlu
b2f71a4d52
BUGFIX: a redirection with an external link that has more than one query string variables. Do not convert the link to html entities
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
215e3a3f60
API CHANGE: Added DataDifferencer, for comparing DataObjects. Note that it won't be used by the core features until 2.3.3, but is made available here for the cmsworkflow module.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
1eee3cc54b
BUGFIX: Ensure that when a page is deleted from stage or live, its descendants are also deleted.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
b57f60b4ee
MINOR #3951 Allow setting test mode by calling ?isTest=1 from the URL (ronan)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sam Minnee
a1d17bc6e0
ENHANCEMENT: Added databse name to output of dev/build (merged from r77265)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
faf652a296
BUGFIX Fixed undefined variable $langAvail in Translatable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Ingo Schommer
56977a0c49
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
59c1f0668e
MINOR Removed double up of semi colon in DataObject
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sam Minnee
8db0532981
BUGFIX: Make requirements combiner work with jQuery
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76955 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
ad7d3a5b9d
BUGFIX #4038 If attempting to set a default locale that doesn't exist, throw a warning in Translatable::set_default_locale()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
60623a42c3
BUGFIX Fixed case where SiteTree->getCMSFields() is missing a parent page, and thus it results in a non-object
...
MINOR Removed unused variable $parentPageTitle, and added missing array that wasn't defined (but used later on causing an undefined variable error)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Hamish Friedlander
c0ae471423
API: Allow specifying any callback to setMarkingFunction, not just a function name.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
d710ad6784
BUGFIX Fixed ErrorPage not showing up properly due to a SQL query that was merged from trunk not compatible with 2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
aeacbfda89
BUGFIX #4058 Requirements::process_combined_files() fixed small typo in the output
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
25e9e7149e
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
42972ec891
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
dfa9f984bb
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
6af50b83e4
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
aa51d57ada
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Normann Lou
a6d804b05d
BUGFIX: typo by legacy: ViewersGroup -> ViewerGroups, EditorsGroup -> EditorGroups
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
e3261ee713
MINOR: reverted r76626
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
98e53ac2f7
MINOR merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
c05728ad30
API CHANGE: Added SiteTree::doDeleteFromLive()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
5066247b68
MINOR: removed file path and extension from image's alt attribe that accessware.co.nz complains about
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00