Ingo Schommer
ea665cd45e
BUGFIX: Disable some permission caching for now, as it was breaking unit tests (from r98504)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99303 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
833db1b5a6
BUGFIX: SiteTree::batch_permission_check() doesn't recurse with ID=0 calls
...
ENHANCEMENT: SiteTree::batch_permission_check() populates its own cache (from r97900)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
daba461c48
MINOR Partially reverted r99079 - SiteTree->getNavigatorItems() was refactored to SilverStripeNavigator::get_for_record()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
2805cfabdb
FEATURE: Add Link to silverstripe navigator (from r97407)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
ed8e75ea8d
APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
6977178c14
MINOR adjustments to ensure that the cached permissions were actually hit (from r98835)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
f5424da34a
BUGFIX: Fixed SiteTree_versions version numbers for published virtual pages. (from r98675)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
474b0b9f7a
MINOR refactored setting/getting strict hierarchy setting. (from r98654)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
f7e872a1c2
API CHANGE: Let sitetree extensions prepopulate permisson cache for their own permissions. (from r98650)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
59b7d14720
MINOR more unit tests around loose hierarchy (from r98509)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
861466f8f8
MINOR added enforce_strict_hierarchy option, and tests around not cascading deletions (from r98498)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
0eeb764f3c
MINOR reload the virtual page if you are looking at the current one on save. To prevent overwriting fields (from r98496)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
b05117bd68
BUGFIX: Generate SiteTree_version records for VirtualPages more reliably. (from r98309)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Tom Rix
d2f05399e0
MINOR fix typo
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:33 +13:00
Tom Rix
9b7d030eda
BUGFIX fix for #5076
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Julian Seidenberg
d5fe2733e0
BUGFIX: modified float to have the same database table schema as int. Now defaults to zero and 'not null'
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:31 +13:00
Sean Harvey
79010479da
BUGFIX #5053 Aggregate::query() should not set an orderby clause, otherwise databases will complain
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:30 +13:00
Geoff Munn
e0f9137afc
BUGFIX: columns quoted properly
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:30 +13:00
Andrew O'Neil
bd57194417
BUGFIX: Fix virtual pages not returning correct content
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:28 +13:00
Ingo Schommer
5ae6f3b9e4
MINOR Partially reverted r98382 which added unnecessarily defensive checking to Hierarchy->allChildren()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Ingo Schommer
badd45a663
BUGFIX Fixed Hierarchy->loadDescendantIdList() to call setOwner() on the extension instance. This was necessary due to underlying Object/Extension changes in 2.4.
...
MINOR Fixed HierarchyTest assertions around including grand children counts
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Sean Harvey
9cf6bd8c7c
BUGFIX #5044 Hierarchy::loadDescendantIDListInto() now uses Object::getExtensionInstance('Hierarchy') instead of going through __call(), as PHP 5.3 has issues converting references to values
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Sam Minnee
e26333e3c9
APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
684a58e3ca
MINOR make showing virtual pages tab conditional
...
MINOR made virtual page tracking sitetree tablelistfield subsite agnostic (from r98005)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
fd2b0bf5ce
MINOR removed redundant method call (from r97817)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
ba02e1dc9f
ENHANCEMENT roll batch permissions in to a generic function (from r97748)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Ingo Schommer
3f8ae83dad
BUGFIX Don't allow translations of VirtualPage (until we can reliably copy data between locales) (see #5000 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
4fbc5572d6
MINOR: fixed typos in the comments
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
f3a2cbf59f
MINOR: added quotes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
1539b8d5e3
MINOR: use DB doubles only in MySQL, fall back to float
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
bac3e43ff4
MINOR better error reporting for broken redirector & virtual pages (from r97185)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
366e7a7fcc
MINOR if the $fieldname to DOS->sort has a direction in it, split it out, and pass it. (from r96482)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Sam Minnee
f212585325
MINOR redirector link tracking is more intelligent (from r96461)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98139 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Sam Minnee
728e51dd8a
MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Mateusz Uzdowski
18b36a60ca
BUGFIX: removing search&replace victim, using unpopulated cache. Reverted to AllChildren, which calls the cache itself.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:22 +13:00
Sean Harvey
caff92709f
ENHANCEMENT Allow user theme selection through SiteConfig, falling back to SSViewer::set_theme() as a default if there are none selected
...
MINOR Unit tests for SSViewer::current_theme() and SiteConfig::getAvailableThemes()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:22 +13:00
Sam Minnee
d64a9c28ca
FEATURE: Add a function to give link to Live site (from r95948)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
0aaca03407
MINOR don't HTML-format queries from showqueries if this is an AJAX request. (from r95855)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
a03e43c8b2
API CHANGE: Refactored test for whether a SQLQuery can be sorted by a particular column into SQLQuery::canSortBy($fieldName) (from r95850)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
ce4067608c
BUGFIX: Make TableListField rely on SQLQuery for its count-generation.
...
BUGFIX: Make SQLQuery return an appropriate count if a HAVING clause is used. (from r95814)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
afe433c9ab
Add some nice date formats (from r95772)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sam Minnee
fc44869850
MINOR added direct links to items in the backlinks report (from r88277)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sean Harvey
e962c33903
MINOR Changed MySQLDatabase::now() block comment to be more useful
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Sean Harvey
2116c46d11
API CHANGE Decimal now allows setting a default value properly
...
MINOR Unit tests for Decimal field type default value through new test class DecimalTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Sean Harvey
61e06bc57e
MINOR Allow creating fixture records without any columns by checking the fields exist first before doing a foreach() in YamlFixture::writeDataObject()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
ef459b2c9c
MINOR: niced the way MultiEnums call requireField to give alternative adapter access
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
bcd9e763ec
MINOR: use ENUM hack for dealing with SET legacy values
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98042 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
9b3fe76269
FEATURE: added support for MySQL data type SET used in MultiEnum FEATURE: added datetime helper functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98041 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Normann Lou
8afcd186f0
APICHANGE: rename the class "Cache" to "SS_Cache" (ref ticket: #4997 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97996 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
15e98877f5
MINOR: groupby works for SQLite too
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Sam Minnee
2294d0986b
BUGFIX #5009 : Removed inappropriate field-detection change on multienums with no default
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Sam Minnee
11368564a3
MINOR: Better error message on bad Enum default
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97979 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
662ee20141
BUGFIX Allowing translations of VirtualPage by not copying over original Locale property (see #5000 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
810b2162da
BUGFIX If a Group doesn't have any specific TRANSLATE_<locale> edit rights, but has general CMS access (CMS_ACCESS_CMSMain, CMS_ACCESS_LeftAndMain, ADMIN), then assign TRANSLATE_ALL permissions as a default. Necessary to avoid locking out CMS editors from their default language (see #4940 and 4941)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
81e409dcae
MINOR Removed debug code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97910 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Carlos Barberis
b1c407e53e
ENHANCEMENT: 2.4 tickets ( #4670 ) new permission code to view draft w/o CMS access
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Tom Rix
c982bbc5df
MINOR fix call to undefined method when a virtual page picks up the wrong object.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Ingo Schommer
a6a1b619fc
MINOR PHP notice error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Sam Minnee
17a5887a80
API CHANGE: Added cancelSchemaUpdate() and doesSchemaNeedUpdating() to the Database class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Andreas Piening
f2098eaac7
MINOR: replaced proprietary update query with one that is ANSI compliant in doPublish()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Sam Minnee
58cf79731b
BUGFIX: Fixed potential data corruption issue when you are changing the class of a SiteTree subclass between two subclasses that share a fieldname.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:14 +13:00
Sam Minnee
9300e52969
API CHANGE #4929 : Add $class argument to DataObjectDecorator::extraStatics()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:14 +13:00
Ingo Schommer
aca7e68b36
MINOR Using SiteTree::get_by_link() in SiteTree->requireDefaultRecords() (see #4590 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:13 +13:00
Hamish Friedlander
c826191897
BUGFIX: Was using custom_database_fields in Aggregate, not database_fields, and so aggregates for the common fields (LastEdited, Created, ClassName) would fail
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:12 +13:00
Hamish Friedlander
0d76dac5a1
FEATURE: Add aggregate calculation to DataObject, allowing (cached) calculation of Max, Min, Count, Avg, etc
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:11 +13:00
Ingo Schommer
3e8526960b
FEATURE Allowing translation of SiteConfig (including toplevel permission groups)
...
BUGFIX Fixed SiteConfig->canView()/canEdit() to respect empty CanViewType/CanEditType assignments.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:11 +13:00
Sam Minnee
1c851476b6
BUGFIX: Let users without a specific TRANSLATE_ permission edit the default locale, so that things don't break when you install the Translatabe module.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
c21a5bf0ad
BUGFIX Fixed URLSegment access for translated homepages in SiteTree->RelativeLink ( #4781 , thanks martijn)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
ccd9ecd230
API CHANGE Deprecated ContentController->LangAttributes(). Use ContentLocale() instead and write attribute names suitable to XHTML/HTML templates directly in the template.
...
ENHANCEMENT Added ContentController->ContentLocale() to allow XHTML/HTML specific lang= attribute settings in custom template code (see #4858 ). Removed <meta http-equiv="Content-Language"...> tag in SiteTree->MetaTags().
ENHANCEMENT Updated blackcandy theme to use new $ContentLocale attribute to set the locale of the current page (in Page.ss)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
ed71153466
MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Will Rossiter
27645dec22
ENHANCEMENT: include menu title in default search. PATCH via lubzee #4508
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97028 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:09 +13:00
Luke Hudson
183f575902
FEATURE: Use tidied HTML in DataDifferencer
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97018 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:09 +13:00
Sean Harvey
e77964a5b9
API CHANGE #3600 Inconsistency in File::getURL() which returns an absolute URL, when it should be relative - please use getAbsoluteURL() instead for old behaviour
...
API CHANGE #3600 Image no longer has an explicit getURL() method, instead it inherits getURL() from File which returns a relative URL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:08 +13:00
Sam Minnee
696aad8e8b
BUGFIX: Fixed bug in VirtualPage::isPublishable() when CopyContentFromID not set
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:08 +13:00
Will Rossiter
d3856638b9
BUGFIX: fixed onBeforeDuplicate calling before page existed
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:08 +13:00
Will Rossiter
a6da69818b
MINOR: added hooks for extending duplicate page functionality
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:08 +13:00
Sam Minnee
252fbf0ba7
BUGFIX: Don't let Versioned archive tables clutter the global state when testing.
...
BUGFIX: Don't let mocked datetimes clutter the global state when testing. (from r96640) (from r96648)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
9e658e09e6
MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
31d194087c
BUGFIX: Don't set the nodelete class on the CMS tree on load, since this is now handled by the batch-action system with an Ajax call. (from r94762)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
0295913673
MINOR track virtual pages that link to the current page (from r94700)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96768 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
deae632bbf
BUGFIX: Don't let users edit the location in the Behaviour tab if they don't have sitetree reorganise permission (from r94609)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96767 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
3bce0ea42f
BUGFIX: Don't publish virtual pages on regular page publish unless the page has already been published. (from r93529)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:07 +13:00
Sam Minnee
332ddb700a
BUGFIX: Virtual pages can be deleted from the live site even when the're not publishable. (from r93319)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
92b4a32e5e
API CHANGE: Added canDeleteFromLive permission to SiteTree, separate from canPublish (from r93315)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
b10f8a908d
BUGFIX: Fixed notice-level errors when checking permissions of pages that don't exist anywhere (from r93166)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96755 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
2d8951193d
MINOR: Removed debugging information: (from r93151)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96753 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
3c88905299
BUGFIX: Add a default list of allowed extensions so that the CMS works reasonably out of the box.
...
BUGFIX: Allow files that don't have an extension (most notably folders)
BUGFIX: Ensure that file URL rewriting works if you rename a page twice without publishing.
BUGFIX: Ensure that the page doesn't go green after URLs are rewritten
ENHANCEMENT: Recognise HTTP_X_FORWARDED_HOST header and use that in place of HTTP_HOST (from r93148)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
fc0bc9ba03
API CHANGE: Define VirtualPage::isPublishable() so that people know not to even request publication if it's not allowed. (from r93098)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96751 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
fe343f9d5d
BUGFIX: Fixed bug in r93095 (from r93097)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
f2416032c6
API CHANGE: Added DataObjectDecorator::cacheKeyComponent() to ensure that the cached behind DataObject::get_one() is appropriately specific (from r93095)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Sam Minnee
b868893a54
BUGFIX: Update virtual pages semantics to grab content from the published version of the source page when you publish the virtual page, and to not allow publication before their source page is published. (from r92209)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
be2219482d
MINOR: Fixed SiteTree::canEdit() for records not yet saved to DB (from r92193)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
14aa0b6bff
MINOR: can_edit_multiple() should return false, not 0, for permission failure. (from r92192)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96744 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
0ce4714fdf
BUGFIX: Use live permissions if the stage page has been deleted. (from r91761)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
26244b743d
BUGFIX: Make virtual page broken link detection work across subsites. (from r91311)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96740 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
337019a4c9
API CHANGE: Added Hierarchy::numHistoricalChildren() and Versioned::get_including_deleted_query()
...
API CHANGE: Added numChildrenMethod arg to getChildrenAsUL, markPartialTree, markChildren, markingFinished
BUGFIX: Clear the bypassStaticCache cookie when you return to the live site. (from r91165)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96739 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:05 +13:00
Sam Minnee
e8cda861e8
MINOR if looking at a specific stage, set a cooking to bypass static cacheing (from r91006)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
d3f3178e8c
MINOR virtual pages are now marked as broken if their pointer page is deleted (from r90996)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
b82640cf62
BUGFIX: Include newly set fields in the differences shown by DataDifferencer (from r90264)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
efd9b2f666
BUGFIX: Use draft site permissions over published, if available. (from r90220)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
63096cfefb
API CHANGE: Don't generate TestOnly DataObjects in the database immediately; instead let test developers specify them in SapphireTest::$extraDataObjects.
...
API CHANGE: Added SapphireTest::resetDBSchema() (from r90054)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
73de615e7c
BUGFIX: Call onBeforeUnpublish/onAfterUnpublish events in doDeleteFromLive, because they amount to the same thing. (from r90001)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
8a0302d2ac
BUGFIX: Fixed broken link correction when a page is deleted. (from r89989)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:04 +13:00
Sam Minnee
84d819f350
BUGFIX: Prevented notice-level error when publishing HTMLText fiels on tables other than SiteTree. (from r89908)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:03 +13:00
Sam Minnee
f0173f5531
BUGFIX: Fixed image link rewriting in virtual pages. (from r89904)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:03 +13:00
Sam Minnee
ad20ff2ac0
BUGFIX: Fixed SiteTree::rewriteFileURL() (from r89804)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96717 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
1539aec9c7
MINOR fix syntax error (from r89472)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
ac1a9da61e
BUGFIX Version field weird'ed up rollback functionality (from r89464)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
51a2eeed15
MERGE merged back a whole bunch of defect fixes from trunk (from r87846)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
5a6131bdde
MINOR changed the method to get a page's siteconfig, it is now subsite aware. (from r89870)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Andrew O'Neil
c65695b807
BUGFIX: Allow set objects as properties if the property is not a database field
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Sean Harvey
30f332cd21
ENHANCEMENT Added Date::Rfc3339() for returning an RFC 3339 valid date format (from r96010)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
465a15b536
BUGFIX Fixed undefined $this->Parent in SiteTree::getCMSFields()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Will Rossiter
354af48f6f
ENHANCEMENT: Improved layout of altercation message when called via CLI. Patch via simon_w #4373
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Sean Harvey
abab0dd631
BUGFIX #4566 Time::Nice() and Time::Nice24() return bad results if there is no value
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:56 +13:00
Sean Harvey
52abe83a2b
MINOR #4973 Automatically generate URLSegment for default records on SiteTree and ErrorPage instead of explicitly setting them
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:56 +13:00
Sean Harvey
bcf57982cc
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
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94297 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:56 +13:00
Tom Rix
e3c1ec7fe3
BUGFIX fixed reference to incorrect class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:55 +13:00
Sean Harvey
38efb79e6f
MINOR Fixed tabs
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Ingo Schommer
c66446b34d
ENHANCEMENT Added parameter to DBLocale->Nice()
...
ENHANCEMENT Added DBLocale->getNativeName()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:54 +13:00
Will Rossiter
eb64eec534
API CHANGE: removed deprecated extend calls (r93632). API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag() (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render on CTF (r93679).
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
07e40ee91f
BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Sean Harvey
9c55927a17
API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Ingo Schommer
311da2d8be
MINOR Fixed path for spyc thirdparty library
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
03c5caea72
MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
fad4957687
BUGFIX Adjusted YamlFixture to new Spyc API: loadFile() instead of load() (from r92566)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93579 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:50 +13:00
Andrew O'Neil
ad52766d6b
MINOR: Increase size of URL length to be lowest common denominator of maximum length in modern browsers.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:38 +13:00
Sean Harvey
5fc556867e
MINOR Whitespace change
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:35 +13:00
Ingo Schommer
654af798ee
MINOR removed concurrent editing (merged from r91198)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:35 +13:00
Ingo Schommer
88a8c04d9b
BUGFIX Returning TRUE on Translatable->hasTranslation() if called on a record that is in the current locale (merged from r91032)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:35 +13:00
Sam Minnee
c9a6d3a1b0
API CHANGE: Added Lower and Upper methods to Varchar, Text, and Enum
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:34 +13:00
Sean Harvey
3ccada55ab
BUGFIX: MSSQL does not support double, using float instead (from r90928)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90934 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13:00
Ingo Schommer
3b794bb97a
MINOR Changed silverstripe.com references to silverstripe.org
...
MINOR Fixed broken wiki links (#4672 )
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:31 +13: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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