Commit Graph

1288 Commits

Author SHA1 Message Date
Ingo Schommer
93d405c4a3 MINOR Fixed tabbing in DataObjectSet (from r100491)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:56:02 +00:00
Ingo Schommer
a06e2af9ef API CHANGE Removed deprecated methods DataObjectSet::filter_map() and DataObjectSet::map_multiple() - please use map() instead! (from r100490)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105576 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:55:47 +00:00
Ingo Schommer
7e8a2c10c9 MINOR Changed places of Object::extInstance() to Object::getExtensionInstance() and added a notice if extInstance is used in future (from r100487)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105575 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:55:30 +00:00
Ingo Schommer
d5e48d55dc ENHANCEMENT #4599 DataObjectSet now uses more array functions instead of performing equivalent tasks - thanks simon_w! (from r100453)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:53:43 +00:00
Ingo Schommer
5db5bbf9df BUGFIX: PHP 5.1 requires an array rather than a string for call_user_func() (from r100367)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:44:54 +00:00
Ingo Schommer
e5eff98e15 BUGFIX: Show Language dropdown in English (#5098) (from r100359)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:44:31 +00:00
Ingo Schommer
179641d972 MINOR correct order of OBW (from r100323)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:43:28 +00:00
Ingo Schommer
d8478a8f59 BUGFIX SQL Error is a member is not part of any groups (from r100053)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:40:56 +00:00
Ingo Schommer
3bd114256b MINOR added Rfc2822 method to SS_Datetime. Fixed bug where dates in DataObject would not set times. (from r100032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:40:37 +00:00
Ingo Schommer
052f71f4b3 MINOR LastEdited/Created dates are now mockable via SS_Datetime (from r100008)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:40:11 +00:00
Ingo Schommer
b632c8ff88 BUGFIX: Fix #5097, Translatable uses augmentValidURLSegment to check that URLSegment is valid (from r99850)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:18:25 +00:00
Ingo Schommer
0ab57094a0 API CHANGE: SiteTree::validURLSegment extendable (#5907)
Uses $this->extend('augmentValidURLSegment')
so that (for instance) Translatable can hook this. (from r99849)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105538 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:16:54 +00:00
Ingo Schommer
097eb6b649 Revert "FEATURE: Use tidied HTML in DataDifferencer"
This reverts commit a0d2f7b3e289d12dedcdbd02ae52eec3e6718340. (from r99848)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:15:54 +00:00
Ingo Schommer
b3409a2ea3 MINOR Reverted r99522 as this will cause problems if File records are deleted when the resampled images are linked to in the content fields (from r99823)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 03:06:35 +00:00
Ingo Schommer
271584e43b MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-23 01:04:16 +00:00
Ingo Schommer
6460d09570 MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-23 00:11:41 +00:00
Ingo Schommer
af88731959 MINOR Merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 06:25:00 +00:00
Ingo Schommer
1f5654ed19 BUFGFIX: Prevent selection of self as parent (see #5106) (from r99732)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 05:36:33 +00:00
Ingo Schommer
5ce40aab7f BUGFIX: Show 'Inherit' option for edit and view all the time (since we now have SiteConfig) (from r99587)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:42:07 +00:00
Ingo Schommer
efc69855ac BUGFIX Image::onBeforeDelete() now calls deleteFormattedImages() so resampled images in the filesystem are cleaned up (from r99522)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:41:43 +00:00
Ingo Schommer
a20e559256 BUGFIX: tablename and columns quoted properly (from r99490)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102865 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:40:45 +00:00
Ingo Schommer
720bcfa61d BUGFIX: batch_permission_check returns null rather than empty array when user has no permissions (from r99443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:40:16 +00:00
Ingo Schommer
6227478f82 FEATURE New DatetimeField class (form field wrapper composed of DateField andTimeField)
FEATURE New DateField and TimeField form classes with more consistent API and easier localization
API CHANGE Date/time parsing in DateField, TimeField and DatetimeField defaults to i18n::get_locale() ('en_US') instead of using en_NZ/en_GB specific parsing. Use i18n::set_locale('en_NZ') in mysite/_config.php to revert to old behaviour.
API CHANGE  constructor parameter in TimeField needs to be in ISO date notation (not PHP's date())
API CHANGE TimeField, DateField and related subclasses use Zend_Date for date parsing, meaning they're stricer than the previously used strtotime()
API CHANGE Removed DMYCalendarDateField and CalendarDateField, use DateField with setConfig('showcalendar')
API CHANGE Removed CompositeDateField, DMYDateField, use DateField with setConfig('dmyfields')
API CHANGE Removed DropdownTimeField, use TimeField with setConfig('showdropdown')
API CHANGE Removed PopupDateTimeField, use DatetimeField
API CHANGE Changed 'date', 'month' and 'year' HTML field names to lowercase in DMYDateField
API CHANGE Removed support for ambiguous date formats in DateField, e.g. '06/03/03'. Use DateField->setConfig('dateformat', '<format>') to revert to this behaviour.
API CHANGE Removed  flag from DateField, CalendarDateField etc., use DateField->setConfig('min') and DateField->setConfig('max')
ENHANCEMENT Using Zend_Date for DateField and TimeField, with more robust date handling, starting localization support. Set globally via i18n::set_locale(), or for a field instance through setLocale(). Note: Javascript validation is not localized yet. (from r99360)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:38:40 +00:00
Ingo Schommer
bf8f089caf BUGFIX: Disable some permission caching for now, as it was breaking unit tests (from r98504) (from r99303)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:11:38 +00:00
Ingo Schommer
da2a530274 BUGFIX: SiteTree::batch_permission_check() doesn't recurse with ID=0 calls
ENHANCEMENT: SiteTree::batch_permission_check() populates its own cache (from r97900) (from r99302)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:11:18 +00:00
Ingo Schommer
65473615d9 MINOR Partially reverted r99079 - SiteTree->getNavigatorItems() was refactored to SilverStripeNavigator::get_for_record() (from r99081)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:04:44 +00:00
Ingo Schommer
fc6ffa5e94 FEATURE: Add Link to silverstripe navigator (from r97407) (from r99080)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:03:40 +00:00
Ingo Schommer
54330495a2 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) (from r99079)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 04:00:43 +00:00
Ingo Schommer
7c057cbecb MINOR adjustments to ensure that the cached permissions were actually hit (from r98835) (from r99068)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102835 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:59:54 +00:00
Ingo Schommer
ffd0774839 BUGFIX: Fixed SiteTree_versions version numbers for published virtual pages. (from r98675) (from r99065)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:58:16 +00:00
Ingo Schommer
000d892256 MINOR refactored setting/getting strict hierarchy setting. (from r98654) (from r99064)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:57:45 +00:00
Ingo Schommer
809072d1bf API CHANGE: Let sitetree extensions prepopulate permisson cache for their own permissions. (from r98650) (from r99063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:57:21 +00:00
Ingo Schommer
a5c2a3e564 MINOR more unit tests around loose hierarchy (from r98509) (from r99062)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102830 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:56:51 +00:00
Ingo Schommer
658e24ea45 MINOR added enforce_strict_hierarchy option, and tests around not cascading deletions (from r98498) (from r99059)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:56:22 +00:00
Ingo Schommer
9c5303285a BUGFIX: Generate SiteTree_version records for VirtualPages more reliably. (from r98309) (from r99052)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:54:36 +00:00
Ingo Schommer
728a401631 MINOR fix typo (from r98980)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:50:41 +00:00
Ingo Schommer
45c5163c18 BUGFIX fix for #5076 (from r98957)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:50:21 +00:00
Ingo Schommer
feabab3808 BUGFIX: modified float to have the same database table schema as int. Now defaults to zero and 'not null' (from r98847)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102805 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:45:20 +00:00
Ingo Schommer
746b2f2f0a BUGFIX #5053 Aggregate::query() should not set an orderby clause, otherwise databases will complain (from r98776)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:31:06 +00:00
Ingo Schommer
16f79a6dd8 BUGFIX: columns quoted properly (from r98694)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:30:49 +00:00
Ingo Schommer
944d013086 MINOR Fixed SiteTree->canViewStage(), merge error from r94253
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:28:51 +00:00
Ingo Schommer
9f2f88fb28 BUGFIX: Fix virtual pages not returning correct content (from r98520)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102762 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:17:29 +00:00
Ingo Schommer
74643c8e51 MINOR Partially reverted accidental commit r102759
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:16:58 +00:00
Ingo Schommer
bfb10b849f BUGFIX Fixed missing third argument to ComplexTableField_Item when the parent class instantiates it (from r98448)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:16:07 +00:00
Ingo Schommer
6a1cb91c9f MINOR Partially reverted r98382 which added unnecessarily defensive checking to Hierarchy->allChildren() (from r98404)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102652 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:23:18 +00:00
Ingo Schommer
dc21cb9ae0 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 (from r98403)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:23:06 +00:00
Ingo Schommer
28fd09115a BUGFIX #5044 Hierarchy::loadDescendantIDListInto() now uses Object::getExtensionInstance('Hierarchy') instead of going through __call(), as PHP 5.3 has issues converting references to values (from r98382)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:22:12 +00:00
Ingo Schommer
d7f2925dc8 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161) (from r98224)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:16:57 +00:00
Ingo Schommer
5ff636c6b4 MINOR make showing virtual pages tab conditional
MINOR made virtual page tracking sitetree tablelistfield subsite agnostic (from r98005) (from r98223)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:29:51 +00:00
Ingo Schommer
a2883d0354 MINOR removed redundant method call (from r97817) (from r98222)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:29:35 +00:00
Ingo Schommer
031835a361 ENHANCEMENT roll batch permissions in to a generic function (from r97748) (from r98219)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:29:03 +00:00
Ingo Schommer
9fdc7cb2ff BUGFIX Don't allow translations of VirtualPage (until we can reliably copy data between locales) (see #5000) (from r98217)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:28:34 +00:00
Ingo Schommer
a3b49b1566 MINOR: fixed typos in the comments (from r98201)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:28:13 +00:00
Ingo Schommer
c63256fb0f MINOR: added quotes (from r98199)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:28:00 +00:00
Ingo Schommer
9f4413421d MINOR: use DB doubles only in MySQL, fall back to float (from r98178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:27:46 +00:00
Ingo Schommer
447ec71471 MINOR better error reporting for broken redirector & virtual pages (from r97185) (from r98155)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:27:30 +00:00
Ingo Schommer
99be47c479 MINOR if the $fieldname to DOS->sort has a direction in it, split it out, and pass it. (from r96482) (from r98140)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:17:25 +00:00
Ingo Schommer
864a15db8e MINOR redirector link tracking is more intelligent (from r96461) (from r98139)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:17:11 +00:00
Ingo Schommer
9b650a4e6c MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428) (from r98138)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:16:50 +00:00
Ingo Schommer
5044de817e BUGFIX: removing search&replace victim, using unpopulated cache. Reverted to AllChildren, which calls the cache itself. (from r98111)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102598 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:13:27 +00:00
Ingo Schommer
21299ba686 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() (from r98110)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:13:12 +00:00
Ingo Schommer
1e20e55c68 MINOR don't HTML-format queries from showqueries if this is an AJAX request. (from r95855) (from r98097)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:06:24 +00:00
Ingo Schommer
453faed88a API CHANGE: Refactored test for whether a SQLQuery can be sorted by a particular column into SQLQuery::canSortBy($fieldName) (from r95850) (from r98096)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:06:12 +00:00
Ingo Schommer
da778dd2a9 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) (from r98094)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:05:45 +00:00
Ingo Schommer
2ae6f896e3 Add some nice date formats (from r95772) (from r98093)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:05:26 +00:00
Ingo Schommer
0ee0244a01 MINOR added direct links to items in the backlinks report (from r88277) (from r98085)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102578 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 02:00:41 +00:00
Ingo Schommer
7bd479156b MINOR Changed MySQLDatabase::now() block comment to be more useful (from r98059)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:53:25 +00:00
Ingo Schommer
a5dde231b6 API CHANGE Decimal now allows setting a default value properly
MINOR Unit tests for Decimal field type default value through new test class DecimalTest (from r98056)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:53:13 +00:00
Ingo Schommer
529ed1dd1d MINOR: niced the way MultiEnums call requireField to give alternative adapter access (from r98043)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:50:15 +00:00
Ingo Schommer
a2055d1d67 MINOR: use ENUM hack for dealing with SET legacy values (from r98042)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:49:58 +00:00
Ingo Schommer
92a25a3e68 FEATURE: added support for MySQL data type SET used in MultiEnum FEATURE: added datetime helper functions (from r98041)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:49:40 +00:00
Ingo Schommer
25ad651966 APICHANGE: rename the class "Cache" to "SS_Cache" (ref ticket: #4997) (from r97996)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102564 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:48:06 +00:00
Ingo Schommer
98de6165ea MINOR: groupby works for SQLite too (from r97985)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:46:51 +00:00
Ingo Schommer
1997485ba3 BUGFIX #5009: Removed inappropriate field-detection change on multienums with no default (from r97980)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102561 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:46:27 +00:00
Ingo Schommer
9e9dcb1b96 MINOR: Better error message on bad Enum default (from r97979)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:45:53 +00:00
Ingo Schommer
6c0efa68de BUGFIX Allowing translations of VirtualPage by not copying over original Locale property (see #5000) (from r97912)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:44:23 +00:00
Ingo Schommer
48bd1ffa24 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) (from r97911)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:44:03 +00:00
Ingo Schommer
6fb2a2a2e0 MINOR Removed debug code (from r97910)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:43:44 +00:00
Ingo Schommer
22fde45409 ENHANCEMENT: 2.4 tickets (#4670) new permission code to view draft w/o CMS access (from r97896)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:34:28 +00:00
Ingo Schommer
54d166c4ce ENHANCEMENT: 2.4 tickets (#4670), new permission code to view draft stage w/o CMS access (from r97895)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 01:33:49 +00:00
Ingo Schommer
279031cc3a MINOR fix call to undefined method when a virtual page picks up the wrong object. (from r97875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:44:25 +00:00
Ingo Schommer
731269988e MINOR PHP notice error (from r97838)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:43:52 +00:00
Ingo Schommer
68fb898c6d API CHANGE: Added cancelSchemaUpdate() and doesSchemaNeedUpdating() to the Database class (from r97827)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102538 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:43:10 +00:00
Ingo Schommer
efa09e60a5 MINOR: replaced proprietary update query with one that is ANSI compliant in doPublish() (from r97705)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:11:58 +00:00
Ingo Schommer
891de73b31 MINOR Fixed undefined variable in SiteTree::can_edit_multiple() (broken in r83442)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102516 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 22:46:40 +00:00
Ingo Schommer
fa8c4b128c BUGFIX: Fixed potential data corruption issue when you are changing the class of a SiteTree subclass between two subclasses that share a fieldname. (from r97594)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 22:30:07 +00:00
Ingo Schommer
1417722d9e API CHANGE #4929: Add $class argument to DataObjectDecorator::extraStatics() (from r97582)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:58:35 +00:00
Ingo Schommer
b70c2df842 MINOR Using SiteTree::get_by_link() in SiteTree->requireDefaultRecords() (see #4590) (from r97484)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:19:54 +00:00
Ingo Schommer
f331e2e1a6 BUGFIX: Was using custom_database_fields in Aggregate, not database_fields, and so aggregates for the common fields (LastEdited, Created, ClassName) would fail (from r97414)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:10:21 +00:00
Ingo Schommer
4e850f6011 FEATURE: Add aggregate calculation to DataObject, allowing (cached) calculation of Max, Min, Count, Avg, etc (from r97390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 05:04:34 +00:00
Ingo Schommer
1039cfade4 FEATURE Allowing translation of SiteConfig (including toplevel permission groups)
BUGFIX Fixed SiteConfig->canView()/canEdit() to respect empty CanViewType/CanEditType assignments. (from r97370)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 05:02:31 +00:00
Ingo Schommer
6eb4d67c86 BUGFIX: Let users without a specific TRANSLATE_ permission edit the default locale, so that things don't break when you install the Translatabe module. (from r97267)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:41:34 +00:00
Ingo Schommer
36dbefedcf BUGFIX Fixed URLSegment access for translated homepages in SiteTree->RelativeLink (#4781, thanks martijn) (from r97211)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:39:50 +00:00
Ingo Schommer
e717044628 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) (from r97207)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:39:35 +00:00
Ingo Schommer
3fe5af85a4 MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277) (from r97182)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102431 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:38:58 +00:00
Ingo Schommer
2f0bc863e7 ENHANCEMENT: include menu title in default search. PATCH via lubzee #4508 (from r97028)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:33:29 +00:00
Ingo Schommer
8a8501c854 FEATURE: Use tidied HTML in DataDifferencer (from r97018)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102420 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:31:35 +00:00
Ingo Schommer
474a6a9931 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 (from r96988)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:29:56 +00:00
Ingo Schommer
24105c9adb BUGFIX: Fixed bug in VirtualPage::isPublishable() when CopyContentFromID not set (from r96941)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102413 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:28:56 +00:00
Ingo Schommer
2f849222f8 BUGFIX: fixed onBeforeDuplicate calling before page existed (from r96879)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:28:22 +00:00
Ingo Schommer
7b3e45539b MINOR: added hooks for extending duplicate page functionality (from r96877)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:28:07 +00:00
Ingo Schommer
9fc3256025 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) (from r96774)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:21:30 +00:00
Ingo Schommer
31bf50d69d MINOR when a parent page is unpublished, unpublish all related virtual pages, includes test coverage (from r94777) (from r96771)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:19:11 +00:00
Ingo Schommer
c0dfaa0b51 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) (from r96770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:18:05 +00:00
Ingo Schommer
112fe3c1d4 MINOR track virtual pages that link to the current page (from r94700) (from r96768)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:17:44 +00:00
Ingo Schommer
07ad87a09a BUGFIX: Don't let users edit the location in the Behaviour tab if they don't have sitetree reorganise permission (from r94609) (from r96767)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:17:25 +00:00
Ingo Schommer
d9bd1af9ec BUGFIX: Don't publish virtual pages on regular page publish unless the page has already been published. (from r93529) (from r96760)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:14:36 +00:00
Ingo Schommer
679d48c2ff BUGFIX: Virtual pages can be deleted from the live site even when the're not publishable. (from r93319) (from r96758)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102389 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:13:26 +00:00
Ingo Schommer
bed078c16d API CHANGE: Added canDeleteFromLive permission to SiteTree, separate from canPublish (from r93315) (from r96756)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:12:45 +00:00
Ingo Schommer
6167cad850 BUGFIX: Fixed notice-level errors when checking permissions of pages that don't exist anywhere (from r93166) (from r96755)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102387 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 03:12:14 +00:00
Ingo Schommer
b124fafb0b MINOR: Removed debugging information: (from r93151) (from r96753)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:45:16 +00:00
Ingo Schommer
46db9796a5 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) (from r96752)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:42:51 +00:00
Ingo Schommer
c83e6718b7 API CHANGE: Define VirtualPage::isPublishable() so that people know not to even request publication if it's not allowed. (from r93098) (from r96751)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:41:23 +00:00
Ingo Schommer
e362790abd BUGFIX: Fixed bug in r93095 (from r93097) (from r96750)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102379 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:41:02 +00:00
Ingo Schommer
08075929ba API CHANGE: Added DataObjectDecorator::cacheKeyComponent() to ensure that the cached behind DataObject::get_one() is appropriately specific (from r93095) (from r96749)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102378 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:40:50 +00:00
Ingo Schommer
b8246bb433 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) (from r96748)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102377 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:40:09 +00:00
Ingo Schommer
1ad6130b64 MINOR: Fixed SiteTree::canEdit() for records not yet saved to DB (from r92193) (from r96745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102372 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:35:43 +00:00
Ingo Schommer
a7d39ef9c1 MINOR: can_edit_multiple() should return false, not 0, for permission failure. (from r92192) (from r96744)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:35:28 +00:00
Ingo Schommer
c672061024 BUGFIX: Use live permissions if the stage page has been deleted. (from r91761) (from r96741)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:34:21 +00:00
Ingo Schommer
967e218758 BUGFIX: Make virtual page broken link detection work across subsites. (from r91311) (from r96740)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:34:04 +00:00
Ingo Schommer
848b7805e2 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) (from r96739)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:33:46 +00:00
Ingo Schommer
6f8f7ba90a MINOR if looking at a specific stage, set a cooking to bypass static cacheing (from r91006) (from r96738)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102364 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:33:08 +00:00
Ingo Schommer
4a3986a28c MINOR virtual pages are now marked as broken if their pointer page is deleted (from r90996) (from r96737)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:32:51 +00:00
Ingo Schommer
43fb34a748 BUGFIX: Include newly set fields in the differences shown by DataDifferencer (from r90264) (from r96736)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102361 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:32:34 +00:00
Ingo Schommer
db859b793a BUGFIX: Use draft site permissions over published, if available. (from r90220) (from r96735)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102357 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:04:15 +00:00
Ingo Schommer
e921b376bc 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) (from r96734)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102356 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:03:16 +00:00
Ingo Schommer
219c57b7bd BUGFIX: Call onBeforeUnpublish/onAfterUnpublish events in doDeleteFromLive, because they amount to the same thing. (from r90001) (from r96732)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:57:56 +00:00
Ingo Schommer
6b85948404 BUGFIX: Fixed broken link correction when a page is deleted. (from r89989) (from r96731)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:57:01 +00:00
Ingo Schommer
d89552485e BUGFIX: Prevented notice-level error when publishing HTMLText fiels on tables other than SiteTree. (from r89908) (from r96724)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:49:50 +00:00
Ingo Schommer
1c0b6163f3 BUGFIX: Fixed image link rewriting in virtual pages. (from r89904) (from r96721)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102344 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:49:23 +00:00
Ingo Schommer
19911cd241 BUGFIX: Fixed SiteTree::rewriteFileURL() (from r89804) (from r96717)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102340 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:47:19 +00:00
Ingo Schommer
cec98c6b63 MINOR fix syntax error (from r89472) (from r96716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:47:04 +00:00
Ingo Schommer
c726569bcf BUGFIX Version field weird'ed up rollback functionality (from r89464) (from r96715)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:46:47 +00:00
Ingo Schommer
603657b943 MERGE merged back a whole bunch of defect fixes from trunk (from r87846) (from r96712)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:45:52 +00:00
Ingo Schommer
670bd4bce4 MINOR changed the method to get a page's siteconfig, it is now subsite aware. (from r89870) (from r96710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:44:06 +00:00
Ingo Schommer
22e789e916 BUGFIX: Allow set objects as properties if the property is not a database field (from r96663)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102329 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:36:30 +00:00
Ingo Schommer
eba3409c20 ENHANCEMENT Added Date::Rfc3339() for returning an RFC 3339 valid date format (from r96010) (from r96049)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102324 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:34:42 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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