tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
2,862 Commits 31 Branches 527 Tags 162 MiB
6d6c294ae3
Commit Graph

695 Commits

Author SHA1 Message Date
Ingo Schommer
6d6c294ae3 BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 14:40:21 +02:00
Ingo Schommer
ca7878453f SECURITY Backporting MySQLDatabase->addslashes() to use mysql_real_escape_string() instead of the non-multibyte-safe addslashes() PHP function, and using it in Convert::raw2sql() 2011-09-15 14:39:52 +02:00
Sean Harvey
a96e5a7dd5 BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer (from r115440) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@115919 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:38 +13:00
Ingo Schommer
bed7d8cee6 BUGFIX Escaping $locale values in Translatable->augmentSQL() in addition to the i18n::validate_locale() input validation (from r114515) (from r114516) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@114517 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:38 +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
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
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
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
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
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
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
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
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
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
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
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
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
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