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
Sam Minnee
dd7bba3f6f
BUGFIX: Fixed versioning of pages (from r101165)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:48:48 +00:00
Sam Minnee
c6b8148052
BUGFIX: Prevent failed migrateVersion writes from breaking versioning system in future writes.
...
BUGFIX: MAke site tree pages go green when you save a new draft.
API CHANGE: Add option for DataObjectDecorator::onAfterSkippedWrite() (from r101155)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:48:07 +00:00
Sam Minnee
7d248e6835
BUGFIX #5214 ViewableData::obj() was creating a DBField without a fieldname argument and caused problems, one example is the version panel of the CMS (from r101154)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:47:48 +00:00
Sam Minnee
79459d72ad
BUGFIX: Ensure that Versioned works on classes with underscores in the names. (from r100905) (from r101153)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:42:45 +00:00
Sam Minnee
e09cc66e94
BUGFIX: Fixed issues with broekn link tracking (from r101138)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:42:25 +00:00
Sam Minnee
5e00afc9c8
API CHANGE: Partial cache adjustments - now supports nested cache blocks (which are independant of their containing cache block), conditionals to control if a given cache block is active, and includes hash of template code in key (so template changes mean cache is invalidated). Changes template control for cache block to <% cached %>, to which the now deprecated <% cacheblock %> is aliased, and an additional template control <% uncached %> has been added. (from r101137)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:41:48 +00:00
Sam Minnee
3650b571fc
BUGFIX: Allow classes to be referred to with casing that differs from their definition. (from r101131)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:41:13 +00:00
Sam Minnee
ab46f9d2b1
BUGFIX ManifestBuilder::up_children() should be declared as static as it's called statically (from r100918)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:39:57 +00:00
Ingo Schommer
3f2cc791ac
MINOR More common language in Date->TimeDiff() ("in 2 hours" instead of "2 hours away") ( fixes #5402 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-10 05:06:50 +00:00
Sam Minnee
d19bf168b0
API CHANGE: Added SiteTree::VirtualPages() and SiteTree::DependentPages() accessors.
...
BUGFIX: Improved reliabilty of broken link tracking.
ENHANCEMENT: Added 'Dependent pages' tab to CMS, to show virtuals, redirectors, and backlinks that point to this page.
BUGFIX: Don't mark a page as changed on stage if the only thing that has changed is broken link metadata (from r101127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:52:46 +00:00
Sam Minnee
bfc354ab7e
BUGFIX: Flush cache after deleting an item.
...
BUGFIX: Fixed databaseFieldsOnly version of DataObject::getChangedFields() (from r101116)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:50:43 +00:00
Sam Minnee
7426ce027c
BUGFIX: Fixed bugs with copying custom fields into Virtual pages, generally made virtual pages more robust and performant. (from r101112)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:49:37 +00:00
Sam Minnee
e2b6291a30
BUGFIX: Fixed link rewriting to work on other HTMLText fields (from r99517) (from r101110)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:48:47 +00:00
Sam Minnee
ca0550bb3a
BUGFIX: Return true if SiteTree:doUnpublish() succeeds. (from r99515) (from r101109)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:48:07 +00:00
Sam Minnee
3db905bc42
BUGFIX: Update Object::parse_class_spec() to handle arrays. (from r101105)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:47:08 +00:00
Sam Minnee
310272bc7e
BUGFIX: call_user_func_array changed to PHP 5.1 compatible notation (from r101099)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:46:55 +00:00