Commit Graph

1731 Commits

Author SHA1 Message Date
Ingo Schommer
6dc8146a87 BUGFIX: SSViewer now allows cli to do a flush on non-dev environments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-11 23:47:17 +00:00
Sam Minnee
fa016ed6b9 ENHANCEMENT: Parse template includes at runtime, so that recursive templates and automatic recompilation of included templates work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-12 03:08:59 +00:00
Ingo Schommer
ca27086c84 BUGFIX Fixed SiteTree->MetaTags() to either use <meta name=> or <meta http-equiv=>, and only using the "http-equiv" attribute for valid HTTP headers (see http://www.w3.org/TR/html4/struct/global.html#edef-META)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@100631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-03-08 20:26:34 +00:00
Ingo Schommer
a4e14d3c56 ENHANCEMENT Allow DataObjectSet to remove duplicates based on any field (#5094, thanks mobiusnz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 22:15:23 +00:00
Ingo Schommer
03b94346ad MINOR Removed message alteration from ValidationResult->error() to make it more predictable for string matching in unit tests like SecurityTest (merged from r98275)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@99705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-23 04:31:47 +00:00
Ingo Schommer
2fc2d72501 BUGFIX Fixed DataObject->fieldLabels() to respect flag
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 02:18:54 +00:00
Geoff Munn
fda7836aca BUG FIX: Default sort columns now quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@98232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-04 19:45:14 +00:00
Andrew Short
82df67ac81 MINOR: Moved the YamlFixture class into the dev directory.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@97399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 22:59:17 +00:00
Andrew Short
0c13c7a091 BUGFIX: Fixed nested URLs operation for pages more than 4 levels deep.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95902 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-18 05:19:28 +00:00
Sean Harvey
f2d264ce3a ENHANCEMENT #3049 Array notation on DataObjectSet is now possible
MINOR Added unit tests for array notation to DataObjectSetTest
MINOR Removed commented out tests from DataObjectSet



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-18 03:35:26 +00:00
Sean Harvey
ba2066b8dd BUGFIX Fixed undefined $this->Parent in SiteTree::getCMSFields() (from r95422)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:49:39 +00:00
Sean Harvey
bb14045626 BUGFIX Fixed ModelAsController::findOldPage() failing on MSSQLDatabase using "sqlsrv" driver (from r94885)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95628 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:43:54 +00:00
Sean Harvey
e64443b50d MINOR: added cookies to Director::test() (from r94684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:42:43 +00:00
Sean Harvey
d1e5f7dc91 ENHANCEMENT: Improved layout of altercation message when called via CLI. Patch via simon_w #4373 (from r94515)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:42:21 +00:00
Sean Harvey
395f87f545 BUGFIX: include customHeadScripts in clear rule. (from r94437)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:41:38 +00:00
Sean Harvey
eb25344862 BUGFIX #4566 Time::Nice() and Time::Nice24() return bad results if there is no value (from r94353)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95600 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:39:23 +00:00
Sean Harvey
afb06e4a80 MINOR #4973 Automatically generate URLSegment for default records on SiteTree and ErrorPage instead of explicitly setting them (from r94352)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95599 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:39:09 +00:00
Sean Harvey
bf9358ee46 FEATURE Added DataObjectSet::emptyItems() to remove all the items from the set - this is useful for when you are augmenting CMS and front end fields via updateCMSFields() and updateFrontEndFields() on a DataObjectDecorator (from r94297)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:37:50 +00:00
Sean Harvey
6be405f189 API CHANGE Renamed ViewableData->SecurityID() to getSecurityID() in order to get its value loading through Form->loadDataFrom() (from r94178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:37:21 +00:00
Sean Harvey
b39b85fe58 BUGFIX #4661 Fix SS temporary directory bug with Windows environments - the directory would always be "silverstripe-cache" instead of a namespaced one so that multiple SS sites don't conflict with eachother (from r94134)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:36:35 +00:00
Sean Harvey
0cc0d3c767 BUGFIX Fixed inconsistent default to ViewableData::Modulus() - should be 0 as per ViewableData::MultipleOf() (from r94073)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:36:20 +00:00
Sean Harvey
ed630229ab BUGFIX Modulus and MultipleOf should start at index 0 to match the iterator position, by default (from r94071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:36:04 +00:00
Sean Harvey
d6e9931eb4 FEATURE Added MultipleOf and Modulus methods to ViewableData - useful for templating work (from r94063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:35:32 +00:00
Sean Harvey
737701007a BUGFIX fixed reference to incorrect class (from r94061)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95583 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:35:15 +00:00
Ingo Schommer
103ebbb168 BUGFIX Escaping Translatable->MetaTags() (#4826, thanks juanparati)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-14 19:59:23 +00:00
Ingo Schommer
8bf1dc5eee ENHANCEMENT Added SiteTree->canViewStage() and using it in ContentController->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@94253 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-02 09:40:45 +00:00
Ingo Schommer
261f8f897a BUGFIX Added Hierarchy::reset() to manually clear marked/expanded states triggered through Hierarchy->markExpanded() etc. This caused side effects when running e.g. CMSMainSearchFormTest and HierarchyTest alongside each other.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 02:24:46 +00:00
Sean Harvey
b9bbecdbee MINOR: Use jquery instead of prototype for silverstripenavigator (from r93966)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93973 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:46:37 +00:00
Ingo Schommer
c340d9a1c5 MINOR Fixed tabs (from r93859)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 00:45:59 +00:00
Ingo Schommer
8d5ff0ce61 API CHANGE: removed Director::Link(). Use Controller::join_links() instead (from r93785)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 00:45:14 +00:00
Ingo Schommer
43dd296076 ENHANCEMENT Added parameter to DBLocale->Nice()
ENHANCEMENT Added DBLocale->getNativeName() (from r93771)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 00:44:46 +00:00
Sean Harvey
c640c5c5a9 MINOR Removed calls to ContentNegotiator::disable() since it's disabled by default (from r93682)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:46:16 +00:00
Sean Harvey
8844c1adf9 BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead (from r93677)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93768 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:46:09 +00:00
Sean Harvey
c5ee0573d1 MINOR Removed ContentNegoitator::disable() from FormResponse - it's disabled already (from r93659)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:45:06 +00:00
Sean Harvey
569e33e99e API CHANGE Removed deprecated static function ContentNegotiator::disable() - it's disabled by default (from r93640)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:43:14 +00:00
Sean Harvey
55f5cb66d4 BUGFIX Fixed dev/build not redirecting properly on first install of SS website on IIS (from r93259)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:26:13 +00:00
Will Rossiter
05832a1dee API CHANGE: removed deprecated removeByFilter() function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 22:18:59 +00:00
Will Rossiter
66c8dab01a MINOR: removed disable call. MINOR: moved static functions above instance methods. (via r93659, r93641)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 22:16:02 +00:00
Will Rossiter
5b5cd8776c API CHANGE Removed deprecated static function ContentNegotiator::disable() (via r93640)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 22:12:40 +00:00
Will Rossiter
be31f19160 API CHANGE: removed $add_action from SiteTree. Use ClassName.SINGULARNAME in the lang tables instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 22:05:06 +00:00
Will Rossiter
c1cf726419 MINOR: added deprecated labels for databaseFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93656 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:52:02 +00:00
Will Rossiter
61a30f9d3a API CHANGE: Removed val(). Use XML_val() instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:37:19 +00:00
Will Rossiter
2ff4631c1f API CHANGE: removed listOfFields() function. Use custom code instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93647 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:24:38 +00:00
Will Rossiter
61ee1b906d BUGFIX: removed deprecated method calls in Image.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93646 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:23:34 +00:00
Will Rossiter
62e13fafad APICHANGE: removed deprectaed Tag() and URL(). Use getTag() and getURL()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:07:39 +00:00
Will Rossiter
f50066cddd APICHANGE: removed deprecated fieldExists() function. Use hasField() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 20:48:36 +00:00
Will Rossiter
e0f1fa8c3a APICHANGE: removed deprecated extend calls
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 20:40:49 +00:00
Ingo Schommer
21fe999a3b MINOR Removed Metadata related fields from RedirectorPage->getCMSFields() (#4747)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92874 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 06:52:08 +00:00
Ingo Schommer
af41180177 MINOR Fixed capitalization of JSMin.php include
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 05:58:32 +00:00
Ingo Schommer
6ff35958ca MINOR Hardcoding SiteTree::, there's no need for this to be configurable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:44 +00:00
Ingo Schommer
253dc1e24e BUGFIX Adjusted YamlFixture to new Spyc API: loadFile() instead of load()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:39 +00:00
Ingo Schommer
46b0f0c959 ENHANCEMENT Deleting formatted images in Image->onBeforeDelete()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:32:43 +00:00
Ingo Schommer
393652aa49 API CHANGE Removed SiteTree->Status database field, and any manual setting of this value in SiteTree logic. Please use SiteTree->IsAddedToStage and similar dynamic getters for this purpose isntead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92544 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:32:03 +00:00
Ingo Schommer
f7f3bc7050 MINOR Removed unused cmsCleanup_parentChanged() callback from Group, Folder and SiteTree classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92543 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:59 +00:00
Ingo Schommer
0b25cb9e14 ENHANCEMENT Removed UpdateURL.js, moved logic to CMSMain.js
ENHANCEMENT Using plain TextField for URLSegment in SiteTree->getCMSFields(), and using custom logic in CMSMain.js. The field didn't have any serverside validation anyway, and the remaining parts are quite custom

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:42 +00:00
Ingo Schommer
b661b40865 MINOR Wrapping ParentType selector in its own CompositeField in SiteTree->getCMSFields() to make it easier to apply javascript behaviour to
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:33 +00:00
Ingo Schommer
204d4fb076 API CHANGED Changed SiteTree->TreeTitle() to getTreeTitle() to make it available as a dynamic property, e.g. for the CMS forms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92534 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:27 +00:00
Ingo Schommer
7ecf3fe5ec MINOR Adjusted to changed TreeNodeAPI->setNodeIcon() arguments - using 'class-' prefix to denote PHP classes in the tree DOM now
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92532 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:21 +00:00
Ingo Schommer
0abe4728d1 ENHANCEMENT Added SiteTree->getStageURLSegment() and SiteTree->getLiveURLSegment() to allow auto-population in the CMS edit form. This information is necessary to keep clientside UI state consistent.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:18 +00:00
Ingo Schommer
9ecd35928c ENHANCEMENT Setting proper text/javascript content-type in FormResponse so clientside ajax-handling knows how to deal with it.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:16 +00:00
Ingo Schommer
353dc66633 MINOR Removed SitetreeAccess.js dependency from SiteTree->getCMSFields(), is now handled in CMSMain.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:06 +00:00
Ingo Schommer
0009b5491c MINOR Markup changes to Translatable->getCMSField() to better support clientside language selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92525 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:03 +00:00
Ingo Schommer
18bd505747 MINOR Removed windowName() manual setting in ContentController->SilverstripeNavigator()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:00 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:29:59 +00:00
Ingo Schommer
b8862a34ff ENHANCEMENT Removed onload_init_tabstrip() call from FormResponse::respond() - tabstrip javascript library is deprecated, and jQuery UI handles its initialization automatically
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:22:28 +00:00
Ingo Schommer
21879b9bf2 MINOR: Increase size of URL length to be lowest common denominator of maximum length in modern browsers. (from r92351)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:44:13 +00:00
Ingo Schommer
abb04b2ea4 BUGFIX Fixed newlines working properly across different platforms - Windows, for example, won't work properly with just \n so use PHP_EOL for a cross-platform solution
MINOR Fixed appropriate failing tests to use PHP_EOL (from r92220)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:43:54 +00:00
Ingo Schommer
f71bf7d804 BUGFIX: Fixed regexp in anchor link rewriting (from r92077)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:43:00 +00:00
Ingo Schommer
eccf13ebf8 MINOR Whitespace change (from r91261)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:41:57 +00:00
Ingo Schommer
3878730edf API CHANGE: Added Lower and Upper methods to Varchar, Text, and Enum (from r91048)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:41:24 +00:00
Ingo Schommer
895644cf9f BUGFIX: Don't failover to standard value in ViewableData_Customised if the customised value is defined but isn't set. $obj->customise(array('Content'=>'')) should set Content to '' (from r91047)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:41:06 +00:00
Ingo Schommer
460380ecb2 BUGFIX Session::destroy() should make use of setcookie() to remove the cookie from the user, unsetting the superglobal doesn't unset from the browser (from r91045)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92450 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:40:50 +00:00
Ingo Schommer
624ddc67cb FEATURE Added Session::destroy() as a means to remove the current session using session_destroy()
ENHANCEMENT Added optional $sid parameter to Session::start() to start the session using an existing session ID (from r91044)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92449 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:40:31 +00:00
Sam Minnee
2db7a1d001 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.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-15 21:24:58 +00:00
Ingo Schommer
2cc517dd2c MINOR Removed invalid deprecation note
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-15 19:48:37 +00:00
Ingo Schommer
ec88536a03 API CHANGE Removed ClassInfo::ready(), use Security::database_is_ready()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-15 19:41:13 +00:00
Ingo Schommer
6f14e7644a BUGFUX Added deleteinstallfiles to $allowed_actions in ContentController (#4701)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-13 21:34:43 +00:00
Andrew O'Neil
70e730efc4 BUGFIX: Fix Date::FormatI18N() to work with accents (dospuntocero)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 02:47:36 +00:00
Andrew O'Neil
962109ff8a NOTFORMERGE: Merged r91209 from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91263 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 02:28:45 +00:00
Tom Rix
94b0ab581e MINOR reverted changes to i18nTextCollector, and updated documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-10 21:50:27 +00:00
Tom Rix
05261244b7 MINOR removed concurrent editing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-10 21:14:08 +00:00
Ingo Schommer
e567b47f07 BUGFIX Returning TRUE on Translatable->hasTranslation() if called on a record that is in the current locale
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-09 04:13:08 +00:00
Andrew Short
175304dd09 BUGFIX: Corrected widget URL matcher pattern to not shift data off that should be passed to the widget controller.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90979 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-08 21:53:57 +00:00
Andrew Short
a8e96ef3f0 MINOR #3728: Updated ViewableData to cast to HTMLText rather than HTMLVarchar by default so more XML-centric methods are exposed.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-08 21:53:56 +00:00
Sam Minnee
4252067f0c MINOR Changed silverstripe.com references to silverstripe.org
MINOR Fixed broken wiki links (#4672) (from r90886)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-06 03:35:07 +00:00
Sam Minnee
7b7d11dd08 BUGFIX Added ContentController->successfullyinstalled() to $allowed_actions (from r90876)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90956 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-06 03:34:46 +00:00
Andreas Piening
edf7d4a134 BUGFIX: MSSQL does not support double, using float instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90928 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 21:44:40 +00:00
Sam Minnee
c4581f741a BUGFIX: Allow null default on MultiEnum fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:14:17 +00:00
Ingo Schommer
c41870203c BUGFIX: Added rewriteHashlinks = 'php' option to SSViewer so that static publisher can handle internal hashlinks properly. (from r89611)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:07:00 +00:00
Sean Harvey
adf9bc89fe BUGFIX Fixed Text::scaffoldFormField() showing a "Is Null" checkbox, even if nullifyEmpty is true
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-03 22:27:56 +00:00
Sam Minnee
b5a5500ff4 BUGFIX: Make DataObject::dbObject('ClassName') work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-02 06:27:00 +00:00
Sam Minnee
f2266dae02 BUGFIX #4609: Fixed portoguese locales in common locales list.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 01:39:36 +00:00
Sam Minnee
7b1076e255 BUGFIX #4617: Make delete formatted images case-insensitive.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 01:38:31 +00:00
Sam Minnee
50831cba9a BUGFIX #2476: Rename lowercase tables to correct casing if they have been transferred from a windows box.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 00:38:38 +00:00
Sam Minnee
bd452e1579 BUGFIX #4063: Corrected base tag for IE6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90547 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 00:16:54 +00:00
Tom Rix
33489cdc7f MINOR i18n'd a whole bunch of the new permission codes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-30 01:43:34 +00:00
Tom Rix
9c5dae4dff MINOR shuffled permissions around, gave them help text and categorized them.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90371 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-29 00:55:20 +00:00
Tom Rix
2e4581fa6d MINOR permission name changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-28 21:23:08 +00:00
Sean Harvey
3d6c6a58d0 MINOR Security text whitespace change to be consistent with eachother when the site is accessed with BasicAuth enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-27 07:27:22 +00:00
Tom Rix
c45e2bf51a BUGFIX fixed typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-27 02:25:25 +00:00
Sam Minnee
994e93f790 API CHANGE: replaced Database::USE_ANSI_SQL with DB::USE_ANSI_SQL
API CHANGE: replaced Database::alteration_message() with DB::alteration_message()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 22:03:29 +00:00
Ingo Schommer
5ca90fd00b ENHANCEMENT Changed Hierarchy->numChildren() caching to be instance specific and respect flushCache(). This increases the amount of queries on large sets, but decreases the time for a single instance call (implemented in r89999)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 20:56:54 +00:00
Ingo Schommer
2527b1543d BUGFIX Don't skip flushCache() extension if $cache_get_one is empty on DataObject->flushCache()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 20:54:50 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 03:06:31 +00:00
Sam Minnee
709f162f13 Merge branch 'master' of git@github.com:sminnee/sapphire
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 23:27:51 +00:00
Sam Minnee
9a83be9140 Merge branch 'master' of git@github.com:sminnee/sapphire
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 23:26:10 +00:00
Andrew O'Neil
0a1392324a BUGFIX: UTF-8 byte order mark gets propagated from template files (#4357)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 02:38:48 +00:00
Andrew O'Neil
0b55bd5259 BUGFIX: Some places want tableList() to have lower case, some want native case - return both!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 02:15:37 +00:00
Andrew O'Neil
8679fd9883 FEATURE: Allow Text/Varchar fields to be configured to differentiate between NULL and empty string. (#4178, petebd)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-23 01:29:55 +00:00
Andrew O'Neil
6eba0473b8 MINOR: Fix php notice (#4620, nicolaas)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90017 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-22 23:07:11 +00:00
Andrew O'Neil
f02e8803b1 ENHANCEMENT: Only run a single query per class for Hierarchy::numChildren()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-22 22:18:02 +00:00
Sean Harvey
09ed10e1b1 MINOR SiteConfig::requireDefaultRecords() shouldn't show a database alteration message if there's already a record
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89975 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-22 07:01:37 +00:00
Sean Harvey
87a8af00c5 BUGFIX Fixed array to string conversion error in Date::setValue() (from r82749)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:30:07 +00:00
Sean Harvey
325f4b6b6f BUGFIX Ensure that before creating default 404 error page, we don't have one already that exists with a record ID (from r81991)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:22:15 +00:00
Sean Harvey
0b7d187817 MINOR Fixed non-object errors in VirtualPage? if source not found (from r81983)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:19:40 +00:00
Sean Harvey
b117becef5 API CHANGE: Change the way that Database::requireField() gets field type information from the underlying database driver. (from r82793)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 02:15:29 +00:00
Sam Minnee
b07e4e5181 MINOR: Fixed column escaping for PostgreSQL support.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-19 22:28:35 +00:00
Sam Minnee
9289de1319 BUGFIX: Removed SiteTree::rewriteLink() method that is no longer necessary due to the use of shortcodes.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-19 04:19:41 +00:00
Ingo Schommer
baf98e81d6 BUGFIX Respecting SiteTree->canDelete() in SiteTree->getCMSActions()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-17 05:11:23 +00:00
Ingo Schommer
613dbf55d0 BUGFIX Fixed SiteTree->validURLSegment() to perform a DataObject::get_one() instead of raw SQL, in order for decorated filtering (e.g. by the subsites module) to apply correctly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-16 00:31:39 +00:00
Sam Minnee
675e841c6e BUGFIX: Detect a brokenh link on an incompletely specified redirector page. (from r89043)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89215 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:41:14 +00:00
Sam Minnee
c1fb483890 MINOR: Removed debugging statement (from r89019)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:40:45 +00:00
Sam Minnee
aaeaf6ccb2 BUGFIX: Fixed image link rewriting and added a test. (from r89011)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:40:06 +00:00
Sam Minnee
e23023b8a9 ENHANCMENT improved reporting around broken links/files (from r88993)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:39:26 +00:00
Sam Minnee
e36798bc9b MINOR added batch deletion back for workflow (from r88916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:36:26 +00:00
Sam Minnee
c50b1e4587 BUGFIX: Fixed inversion of condition created in r88869 (from r88905)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:36:15 +00:00
Sam Minnee
fc8786ee4e MINOR implement new permission code around SiteConfig. (from r88869)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:35:45 +00:00
Sam Minnee
08166d902a MINOR notice fix (from r85379)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:32:48 +00:00
Sam Minnee
d9ec2b327f MINOR permission fix (from r85373)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:31:44 +00:00
Sam Minnee
ae24151fe5 FEATURE SiteConfig (from r85339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:30:34 +00:00
Sam Minnee
405fa48f84 MINOR don't cache redirector pages (from r85212)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:28:05 +00:00
Sam Minnee
1fed31cb9e #108 - Subsite Virtual Page ordering (from r84848)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:27:48 +00:00
Sam Minnee
500ce4a91d MINOR added better status reporting to batch actions. Will now report the correct number of pages actioned in the status message (from r88786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:41 +00:00
Sam Minnee
b25427c732 BUGFIX: Fixed generation of static cache files in subdirectories. (from r88569)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:24:29 +00:00
Sam Minnee
e9ff3f3711 MINOR added en_GB to list of common locales (from r88073)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:22:16 +00:00
Sam Minnee
425f5d278c MINOR: Hide readonly permission group fields on pages when not relevant,
as they are confusing. (from r88019)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:21:41 +00:00
Sam Minnee
4e6911610a FEATURE: Add another permission code that allows users to edit siteconfig without having admin priveleges (from r87261)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:20:39 +00:00
Sam Minnee
af2c0b0f34 BUGFIX: Fix broken link tracking of linked files (from r87252)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:20:11 +00:00
Sam Minnee
f84180813f #150 - Pages with similar content
#148 - Stable against restructures (from r87251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:19:25 +00:00
Sam Minnee
03221dce35 MINOR: Copy "ShowInMenus" when a VirtualPage is first created (from r86357)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:11:26 +00:00
Sam Minnee
d2cd852df4 BUGFIX: Fix image tracking to take resized images into account (from r86198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:11:19 +00:00
Sam Minnee
567612bd16 MINOR can_edit_multiple fix
MINOR fixed ie6 prompt defect
MINOR track publish actions
MINOR dont reset workflow if it's sitting at AwaitingEdit on save. (from r86251)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:58:24 +00:00
Ingo Schommer
b930149c3a BUGFIX Fixed RequestHandler->allowedActions() lowercasing of actions - was applying the logic, but not writing it back to the $actions array.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:50:02 +00:00
Ingo Schommer
00eb220e91 BUGFIX Don't return empty value from ViewableData->XML_val() if the actual value is an uncasted 0 integeter (or anything else evaluating to untyped boolean false)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:48:24 +00:00
Sam Minnee
438a51956a MINOR: Wording on permissions (from r85643)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:47:52 +00:00
Sam Minnee
88fd58dc69 FEATURE: Virtual pages now copy allowed children from the page they are
pointing at. (from r85197)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:45 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:13 +00:00
Andrew Short
7277ada137 BUGFIX: Added PageComments to ContentController::$allowed_actions so commenting works.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:49:49 +00:00
Sean Harvey
559bbfcca8 BUGFIX #4605 DataObject::newClassInstance() should repopulate it's defaults after changing to an instance of a different class, otherwise databases will complain of NULL values being written to columns that don't accept NULL values.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88956 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-14 06:35:45 +00:00
Andrew Short
2be58d19f3 BUGFIX: Updated ModelAsController->findOldPage() query to be cross-database compatible.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 02:43:39 +00:00
Andrew Short
94d2913f09 API CHANGE: HTTPRequest and HTTPResponse no longer inherit from Object, since they should not be extended.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 02:43:30 +00:00
Andrew Short
d4acf7c938 MINOR: Removed unnecessary extension instance check in Object->__construct(), since Extensions no longer inherit from Object.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 01:44:21 +00:00
Andrew Short
b59507414f API CHANGE: SSViewer and SQLQuery no longer inherit from Object, since they should not be extended.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 22:28:47 +00:00
Andrew Short
5c316aa1c0 MINOR: Removed unnecessary check in DataObject->hasField() and optimised DataObject->db() call.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88699 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 22:28:30 +00:00
Sam Minnee
24435fbbf7 BUGFIX: Fixed bugs in ViewableData casting system.
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88664 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 06:58:40 +00:00
Sam Minnee
cad7d5e859 ENHANCEMENT: Make base tag in 404 page dynamic (from r72282)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 03:23:10 +00:00
Sam Minnee
b868075ef3 ENHANCEMENT: Improved performance of ViewableData casting by removing an object::get_static call
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-12 00:40:15 +00:00
Sam Minnee
5680cc97e6 MINOR: Properly quoted column name in SiteTree->validURLSegment() for postgresql support
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 10:31:19 +00:00
Sam Minnee
68279be998 BUGFIX: Fix regression in r88521 that prevented the index action from being explictly disabled by setting the * key in allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 09:15:51 +00:00
Sam Minnee
1fce2e614b BUGFIX: Ensure that the index action works even if allowed_actions is set.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 05:16:18 +00:00
Andrew Short
8546a6d194 MINOR: Updated SiteTree->ElementName() to generate the identifier from the full link rather than the URLSegment.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:26 +00:00
Andrew Short
72592d8c14 FEATURE: Added RequestHandler->allowedActions() to return a unified representation (including extensions) of all allowed actions on a controller.
BUGFIX: Updated Controller->hasAction() to use RequestHandler->allowedActions() so that extension actions are recognised.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:26 +00:00
Andrew Short
06fbb96f88 API CHANGE: Decoupled ErrorPage::response_for() from the request and updated it so it will only return a response if an appropriate error page can be found.
MINOR: Updated ContentController->httpError() to use Controller->httpError() if there is no error page.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:25 +00:00
Andrew Short
53450e1221 MINOR: Updated Controller to return a 404 on actions that don't exist, rather than a 403.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:24 +00:00
Andrew Short
da4b65c749 FEATURE: Added RequestHandler->hasAction() and Controller->hasAction() to check if a specific action is defined on a controller.
ENHANCEMENT: Updated ContentController->handleRequest() to use Controller->hasAction() to check whether to fall over to a child page, rather than relying on an error response from Controller->handleRequest().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:23 +00:00
ajshort
97ac0008b3 ENHANCEMENT: Cached the value for RootURLController::get_homepage_link() between calls.
From: ajshort <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:22 +00:00
Andrew Short
ea906a50a8 FEATURE: Implemented Translatable::get_homepage_link_by_locale() to enable translated home pages to function.
FEATURE: Updated SiteTree::get_by_link() to integrate with translatable, and allow it to work across languages by implementing Translatable->alternateGetByLink().
API CHANGE: Moved lang_filter enabling & disabling into static methods on Translatable, and renamed to locale_filter.
BUGFIX: Fixed viewing a translatable page by URL without explicitly setting a Locale in ContentController->handleRequest().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88503 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:22 +00:00
Andrew Short
80c8780b6f ENHANCEMENT: Updated the SiteTree URLSegment conflict resolver to work with nested URLs.
MINOR: Added tests for SiteTree->validURLSegment().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:21 +00:00
Andrew Short
0ddef87117 ENHANCEMENT: Updated SiteTree CMS fields to be in line with nested URL changes.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:20 +00:00
Andrew Short
beebf785b5 ENHANCEMENT: Refactored ModelAsController to only grab the first page of a request, then pass control on to it.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:19 +00:00
Andrew Short
4cc56abecb MINOR: Updated ContentController->ChildrenOf() to use new SiteTree functions, and added tests.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:19 +00:00
Andrew Short
3a0f809387 MINOR: Removed link rewriting methods on SiteTree that are no longer necessary due to linking changes.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:18 +00:00
Andrew Short
ad7194cc40 FEATURE: Refactored RootURLController to allow nested home pages.
MINOR: Deprecated RootURLController::get_homepage_urlsegment() in favour of get_homepage_link().
MINOR: Updated SiteTree->RelativeLink() to return a link to the site root for the home page.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:17 +00:00
Andrew Short
f29eceecff API CHANGE #3724: Unified the Link() method to accept an action parameter.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:16 +00:00
Andrew Short
c1c7973b95 BUGFIX: Fixed Controller::join_links() to properly handle multiple consecutive slashes.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:15 +00:00
Andrew Short
bc143c8c1e MINOR: Updated SiteTree->generateURLSegment() to trim the link of dashes before returning.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:12 +00:00
Andrew Short
cb35b13905 ENHANCEMENT: Updated the SiteTree link and section code to derive data from the current page, rather than relying on its own cache.
MINOR: Added tests for the link and section code.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:11 +00:00
Andrew Short
3defa4931c ENHANCEMENT: Added Hierachy->getAncestors() to return all the parent objects of the class in a DataObjectSet.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:10 +00:00
Andrew Short
bf50f560df ENHANCEMENT: Update ContentController to manually set the current Director page in handleRequest().
MINOR: Deprecated Director::currentPage() in favour of Director::get_current_page().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:10 +00:00
Andrew Short
452b7f7246 MINOR: Updated SSViewer to accept any character except commas and closing parenthesis inside arguments.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88486 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:09 +00:00
Andrew Short
d4fb917825 MINOR: Replaced usage of the deprecated SiteTree::get_by_url() with get_by_link().
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:08 +00:00
Andrew Short
57f9a957bc FEATURE: Added SiteTree::get_by_link() to fetch the SiteTree object associated with a nested link.
MINOR : Deprecated SiteTree::get_by_url().

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:08 +00:00
Andrew Short
da2fd13b38 FEATURE: Allow you to access nested pages by falling over to a child page in ContentController if one is available.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:07 +00:00
Andrew Short
4a054c0cc5 FEATURE: Allow you to link to SiteTree? objects in HTMLText or HTMLVarchar fields by using a "[sitetree_link id=n]" shortcode.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:04 +00:00
Andrew Short
acc063984b ENHANCEMENT: Added ErrorPage::response_for() to get a response for a HTTP error code and request.
MINOR: Updated ModelAsController to generate errors with ErrorPage.
MINOR: Updated ContentController to generate HTTP errors with ErrorPage.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:03 +00:00
Andrew Short
3eafee7799 ENHANCEMENT: Added ModelAsController::controller_for() to link a SiteTree object to its controller.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:02 +00:00
Andrew Short
490835633c ENHANCEMENT: Added HTTPRequest->isMedia() to check if a request is for a common media type.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:02 +00:00
Andrew Short
cf2cf11b57 ENHANCEMENT: Do not allow access to actions that have not been defined or do not have an action template.
ENHANCEMENT: Added Controller->hasActionTemplate() to check if a template exists for a specific action.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:01 +00:00
Andrew Short
3599a105fd ENHANCEMENT: Updated SiteTree linking methods to generate nested URLs.
MINOR: Updated ContentController->Link() to force links generated by a controller to always be returned in their full form.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88476 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:00 +00:00
Andrew Short
55408946a6 MINOR: Parse HTMLText and HTMLVarchar values with ShortcodeParser before inserting into a template.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:59 +00:00
Andrew Short
365b4784a9 FEATURE: Refactored ViewableData. The main changes are:
* Values are not always casted before being rendered into a template.
	* Casting information can by dynamically provided by $casting_properties, rather than being hardcoded to $casting and $db.
	* Removed unneeded ViewableData_Iterator - ArrayIterator is instead used.
	* Removed ViewableData_ObjectCustomised - now just uses ViewableData_Customised.
ENHANCEMENT: Added template and value methods to database fields.
MINOR: Added ViewableDataTest and extended DataObjectTest.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:58 +00:00
Andrew Short
75b875ae39 BUGFIX: Updated HTTP::findByTagAndAttribute() to be more versatile, especially when dealing with attributes containing special characters.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:55 +00:00
Andrew Short
bd5b134c37 FEATURE: Added utility methods to enable and disable nested URLs to SiteTree.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:54 +00:00
Andrew Short
d81d7593b3 MINOR ajshort: Deprecated un-used HTTPResponse->getLinks() method that duplicated functionality.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:53 +00:00
Geoff Munn
84ec644448 API CHANGE: support for advanced database options now included
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88296 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-08 01:22:06 +00:00
Geoff Munn
f552743006 API CHANGE: The advancedOptions variable now passed to the database connection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88295 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-08 01:21:41 +00:00
Geoff Munn
084e3801c5 API CHANGE: $database_extensions static variable now supported
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88294 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-08 01:21:24 +00:00
Geoff Munn
e31b4abb7b API CHANGE: The advancedOptions variable now passed to the database connection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-08 01:20:30 +00:00
Sam Minnee
baea4ee2ba BUGFIX #3685: Fixed setting of character set by default when no content negotiator is used.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-06 21:44:38 +00:00
Ingo Schommer
54824945f5 MINOR Don't invoke Translatable->providePermissions() if its not enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-05 20:39:57 +00:00