Ingo Schommer
452a8f8839
MINOR Using SecurityToken in ViewableData->getSecurityID() (from r113274)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@113312 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:37 +13:00
Ingo Schommer
75bd92de3c
BUGFIX Clear static marking caches on Hierarchy->flushCache() (from r113277)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@113302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:37 +13:00
Ingo Schommer
a5dfb6257d
ENHACENEMENT: Change behaviour of the MenufestBuilder to use spl_autoload_register instead of traditional __autoload.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@111831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:36 +13:00
Sean Harvey
8e5239ff57
MINOR Fixed missing closing <div> in ContentController->successfullyinstalled() (from r101254)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@101258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:35 +13:00
Ingo Schommer
b83797de10
BUGFIX Don't delete index.php after successful installation - in ContentController->deleteinstallfiles(). URL routing might rely on it without mod_rewrite.
...
BUGFIX Require ADMIN permissions for ContentController->deleteinstallfiles() - together with retaining index.php this removed a vulnerability where unauthenticated users can disrupt mod_rewrite-less URL routing. (from r101227)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@101229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:35 +13:00
Ingo Schommer
8698e94ae0
MINOR Added test case for Hierarchy::getDescendantIDList() which also tests Hierarchy::loadDescendantIDListInto() (merged from r98369)
...
MINOR Testing of grand-children items in HierarchyTest::testLoadDescendantIDListIntoArray() and HierarchyTest::testNumChildren() (merged from r98376)
BUGFIX #5044 Hierarchy::loadDescendantIDListInto() now uses Object::getExtensionInstance('Hierarchy') instead of going through call(), as PHP 5.3 has issues converting references to values
BUGFIX Fixed Hierarchy->loadDescendantIdList() to call setOwner() on the extension instance. This was necessary due to underlying Object/Extension changes in 2.4. (merged from r98403)
MINOR Fixed HierarchyTest assertions around including grand children counts (merged from r98403)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@98405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:35 +13:00
Ingo Schommer
b3931cc707
API CHANGE HTTP::setGetVar() always returns absolute URLs. Use Director::makeRelative() to make them relative again. (merged from r98373)
...
API CHANGE HTTP::setGetVar() combines any GET parameters in PHP array notation (e.g. "foo[bar]=val") instead of replacing the whole array (merged from r98373)
BUGFIX HTTP::setGetVar() uses parse_url() and http_build_query() to add query parameters to an existing URL, instead of doing its own regex-based parsing. This means existing GET parameters are correctly url encoded. (merged from r98373)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@98375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:35 +13:00
Andrew O'Neil
8906391495
BUGFIX: Don't force SSL when running from CLI
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@98273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:35 +13:00
Ingo Schommer
0c684b8061
BUGFIX Limiting ?debug_memory parameter to development environments through using Debug::message() instead of a straight echo() (merged from r74067)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@98229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:34 +13:00
Will Rossiter
cd64c943f7
MINOR: fixed notice level error when ImageSource isnt set
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@97004 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:34 +13:00
Sean Harvey
24cead4d33
MINOR Merged in Versioned::get_all_versions() fix from r76223
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@92161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:34 +13:00
Sam Minnee
a2fc20de22
API CHANGE: Replaced BasicAuth::enable() with BasicAuth::protect_entire_site()
...
API CHANGE: BasicAuth::requireLogin() no longer has an option to automatically log you in. You can call logIn() on the object returned, instead. (from r91603)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@91610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Sam Minnee
15f1905889
BUGFIX: Added rewriteHashlinks = 'php' option to SSViewer so that static publisher can handle internal hashlinks properly.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@89611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Andrew O'Neil
ad7c4eca89
reverted
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Andrew O'Neil
e21297ecc0
BUGFIX: Ensure ASSETS_PATH is respected
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Sam Minnee
98dda12a9d
API CHANGE: Added increase_time_limit_to(), which respects safe_mode.
...
API CHANGE: Added no-arg option to increase_memory_limit_to() (from r80241)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@88176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Sam Minnee
cb21b2947d
BUGFIX #4579 : Translatable's call to new LanguageDropdownField() broked (from r87456)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@87458 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:33 +13:00
Jeremy Warne
11283a8f51
BUGFIX: findByTagAndAttribute is unintentionally expanding any php found in the href/src components its regex extracts. Changed double quotes to single quotes to fix this.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@85632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:32 +13:00
Sam Minnee
427cce498d
API CHANGE: Make Object::uninherited_static() have a separate execution path to Object::get_static(), for more reliable operation. The intention is that for any given static, you either use Object::get_static() or you use Object::uninherited_static() - not both. (from r84151, r84155, r84156)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@84157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:32 +13:00
Sam Minnee
047d17d512
MINOR: Reverted r83936 because it was inappropriate - only page-relative hashlinks should be rewritten
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@84060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:32 +13:00
Tom Rix
cd73e27fe1
MINOR fix rewrite of anchors
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83936 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:32 +13:00
Sean Harvey
d838529953
BUGFIX Object subclasses with a constructor that didn't already will now call parent to respect inheritance
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Sean Harvey
008acc99a0
MINOR If the instance class property can't be found in DataObject::defineMethods(), throw an error because parent::__construct() hasn't been called which will break DataObjectDecorator
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Sean Harvey
99038acbf1
MINOR Fixed PHP notice in DataObjectSet::groupBy() by defining $result before returning it
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83450 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Will Rossiter
5329e9bfc5
MINOR: merged patch from #4421 . Fixed syntax error with Requirements::combine_files() and css files
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
Will Rossiter
34681d114f
MINOR: merged patch for #4416 . Refactored the method exists switch for extraStatics
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:31 +13:00
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