tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-18 15:36:30 +02:00
Code Issues Projects Releases Wiki Activity
4,244 Commits 30 Branches 526 Tags 155 MiB
da671c628d
Commit Graph

1881 Commits

Author SHA1 Message Date
Sam Minnee
2948bc1c64 MINOR: Misc merges from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112142 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:53:12 +00:00
Sam Minnee
90514f2ae3 BUGFIX: Don't show error when adding default SiteConfig records after upgrading a site. (from r103341) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112134 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:44:14 +00:00
Sam Minnee
1379f133ea MINOR Enum DBField class should default to ExactMatchFilter to avoid wrong results with overlapping Enum values in LIKE queries (see #5434) (from r103322) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112132 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:40:36 +00:00
Sam Minnee
49496e5c4b BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:40:05 +00:00
Sam Minnee
5cb4090145 BUGFIX: r101093 broke casting of values from the failover object. Add lookup to the failover for casting info, and add test (from r103240) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112127 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:38:23 +00:00
Sam Minnee
37f18971c5 ENHANCEMENT: allow onAfterPublish and onBeforePublish handlers directly on Page classes (#5112) (from r103198) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112124 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:35:19 +00:00
Sam Minnee
6387f735e3 BUGFIX Only replace double slashes in SS_HTTPRequest->__construct() for relative- its a failsafe against wrongly formatted URLs like 'admin//assets' instead of 'admin/assets', but breaks absolute URLs with 'http://' prefix (from r103099) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112120 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:31:53 +00:00
Sam Minnee
4db5dd3e47 MINOR: fixed the error message on class conflict (#5439, patch submitted by rorschach) (from r103093) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:31:22 +00:00
Sam Minnee
eef3ff8021 BUGFIX: disallow numeric actions - numeric array indexes are incorrectly picked up as allowed actions (#5331) (from r103092) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112118 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:30:54 +00:00
Sam Minnee
0914dd55c5 ENHANCEMENT: allow to check for any changed fields on the DataObject, this is expected behaviour when isChanged function is called without parameters (#5421, patch by walec51) (from r103047) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112072 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:48:48 +00:00
Sam Minnee
961d4ce298 BUGFIX: added optional separator for http_build_query in HTTP:setGetVar(). this fixes sorting columns in ModelAdmin (ticket #5325). (from r103012) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112071 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:48:24 +00:00
Sam Minnee
83f117f58c MINOR Using canView() instead of deprecated can('view') in ContentController (from r102909) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112070 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:46:33 +00:00
Sam Minnee
64a561f96c BUGFIX Fixing RquestHandler->checkAccessAction() on PHP 5.2 - ReflectionMethod->class returns inconsisent results in older PHP versions. (see r102003) (from r102730) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112069 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:46:02 +00:00
Sam Minnee
322a2da0dc BUGFIX Float should always be not null and default 0 in the database (from r102686) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112068 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:45:24 +00:00
Sam Minnee
268800dec6 BUGFIX #5316 Float and Double should never try to save NULL as the "null" value (from r102460) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112067 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:43:58 +00:00
Sam Minnee
29edff8c38 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364) (from r102386) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112065 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:41:14 +00:00
Sam Minnee
890ac94a6a MINOR: Several changes merged from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112060 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:35:19 +00:00
Sam Minnee
ddf66c1fec BUGFIX Fixed SiteTree::page_type_classes() removal of base class (was broken if database driver returned classes in arbitrary order, e.g. in Postgres) (from r102026) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112058 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:28:02 +00:00
Sam Minnee
e8e7065ff4 MINOR Fixed indentation (from r102009) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112055 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:26:16 +00:00
Sam Minnee
1d61bf7100 BUGFIX Prevent handling of controller actions which return $this avoid infinite loops in RequestHandler->handleRequest (thanks Hamish!) (from r102004) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112054 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:24:53 +00:00
Sam Minnee
740e49061f API CHANGE Disallow methods/actions in RequestHandler->checkAccessAction() which are implemented on parent classes (e.g. ViewableData and Object), unless access is controlled through $allowed_actions. This limits information exposure from getters used in template contexts. (from r102003) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112053 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:24:15 +00:00
Sam Minnee
28c2c67355 BUGFIX Checking for existing redirections in FormResponse::respond (fixes #5208) (from r101958) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112050 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:21:45 +00:00
Sam Minnee
daa50b9d3b BUGFIX: Ensure that DataObject IDs are numbers and no string equivalents of numbers - 3 not '3' (from r101939) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112049 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:19:33 +00:00
Sam Minnee
bbdad4207f MINOR take advantage of an alternate path for error pages (from r101883) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112048 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:18:35 +00:00
Sam Minnee
34207e069a BUGFIX #4188 simon_w: Let require tags in templates be conditional (from r101867) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112044 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:15:47 +00:00
Sam Minnee
3ba0434d6d BUGFIX: Recover if a manifestClassParse file doesn't have the necessary content. (from r101866) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112043 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:15:13 +00:00
Sam Minnee
c5c7dee5f0 API CHANGE: Allow cached blocks within control and if blocks, as long as that control or if block is contained within an uncached block, not a cached block (from r101833) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112042 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:14:49 +00:00
Sam Minnee
ca5c2323a1 BUGFIX: preserve the port value if given in HTTP::setGetVar (#5280). BUGFIX: allow username only input rather than user:pass combo. (from r101793) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112037 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:08:10 +00:00
Sam Minnee
2996e2a60d BUGFIX: disable function re-enabled (from r101792) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:07:35 +00:00
Sam Minnee
dad17e2330 MINOR Marked DataObject::has_own_table() as static (from r101782) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112034 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:06:47 +00:00
Sam Minnee
9087f79723 BUGFIX Always including "Locale" field in Translatable->getCMSFields() regardless of "excluded" page types. Necessary to enable form state serialization for fields like TreeSelectorField on a VirtualPage (fixes #5269) (from r101747) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112031 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:05:08 +00:00
Sam Minnee
fd8e0044c4 BUGFIX Versioned->publish() with $createNewVersion=TRUE now increases version number of in-memory object (fixes #5261) (from r101739) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112030 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:04:38 +00:00
Sam Minnee
142bb640ec BUGFIX #5277 Sort of default SiteTree records is now explicitly set to avoid strange ordering set by SiteTree::onBeforeWrite for default records (from r101724) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112028 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:03:25 +00:00
Sam Minnee
1bbec96aa1 BUGFIX Don't replace "home/" URLSegment in SiteTree->RelativeLink() if Translatable is enabled and the homepage is not on the root level (nested URLs allows you to have homepages called "en/home" and "ru/home") (fixes #5244) (from r101711) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112025 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:01:38 +00:00
Sam Minnee
6ba32686b1 MINOR Reverted r101670 as it broke assumptions made in RedirectorPageTest (from r101671) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112018 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:39 +00:00
Sam Minnee
6490b111b6 ENHANCEMENT RedirectorPage ExternalURL field now defaults to http:// to be consistent with the "Another website" option for HtmlEditorField LinkForm (from r101670) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112017 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:20 +00:00
Sam Minnee
7d3d9a005e BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found (from r101668) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112016 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:57:45 +00:00
Sam Minnee
c08e277ba0 BUGFIX #5245 Sometimes page records will have a NULL ParentID value, it should be a number even if it's 0 (thanks wrossiter!) (from r101657) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112014 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:56:27 +00:00
Sam Minnee
4414b8a747 BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb! 
MINOR Updated ViewableDataTest to verify ViewableData changes (from r101638)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112013 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:56:04 +00:00
Sam Minnee
f073c9b60c BUGFIX: test that the class exists before running subclass tests (from r101631) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112012 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:55:31 +00:00
Sam Minnee
1e860727db BUGFIX: put back into the SSNavigator the archived site link (#5251) (from r101623) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112011 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:55:11 +00:00
Sam Minnee
ac27c7217f BUGFIX: the function makes an assumption we are working on Draft site, and breaks if we are not. Rewritten to be stage-independent, as get_version (open #5231) (from r101603) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112006 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:50:48 +00:00
Sam Minnee
9246add340 MINOR: fixed notice level error (from r101600) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112005 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:50:16 +00:00
Sam Minnee
30849b0716 BUGFIX: HTTP::setGetVar() returns a relative URL if a relative URL is passed, to make behaviour closer to 2.3 (from r101392) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111999 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:46:12 +00:00
Sam Minnee
559a05b059 MINOR Removed rewritest.php places in sapphire since it's no longer part of the phpinstaller/branches/2.4 package (from r101353) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111995 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:43:39 +00:00
Sam Minnee
135b65ee04 BUGFIX Fixed SiteTree->Content link shortcode parsing introduced in r101093 (#5227) (from r101302) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111992 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:42:17 +00:00
Sam Minnee
0d5a0e73fe BUGFIX Checking for existence of "ShowInMenus" property in Folder->liveChildren() and stageChildren() (#5190) (from r101264) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111978 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:58:49 +00:00
Sam Minnee
1dcc5401f6 MINOR Fixed missing closing <div> in ContentController->successfullyinstalled() (from r101254) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111977 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:58:09 +00:00
Sam Minnee
51e34da550 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/trunk@111974 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:56:06 +00:00
Sam Minnee
8f41e08139 BUGFIX: Don't recreate a missing draft page when calling SiteTree::doUnpublish() (from r101170) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111967 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:49:52 +00:00