tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 01:19:29 +02:00
Code Issues Projects Releases Wiki Activity
4,786 Commits 29 Branches 516 Tags 147 MiB
33d102d674
Commit Graph

2089 Commits

Author SHA1 Message Date
Ingo Schommer
723731a574 BUGFIX: Replaced Versioned's unique index definition with an array syntax. (from r106120) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112520 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:57:46 +00:00
Ingo Schommer
2aed7be053 BUGFIX: Fixed SiteTree::IsModifiedOnStage() for an edge-case that was identified when deleteFromStage() stopped manipulating the current record. (from r106082) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112516 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:56:05 +00:00
Ingo Schommer
c7b47d8a8b BUGFIX: Don't let deleteFromStage() kill the ID of the original record. (from r106080) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112515 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:55:45 +00:00
Ingo Schommer
03c3d59ba0 BUGFIX: Add a unique index to SiteTree_versions.RecordID+Version. Fix saving methods to support this. (from r106079) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112514 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:55:15 +00:00
Ingo Schommer
ee0d4c5197 BUGFIX: Throw an exception if you try an delete an unsaved or already-deleted record (from r106078) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112513 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:54:34 +00:00
Ingo Schommer
716b5cd6c5 BUGFIX: reverted revision 105890 to fix build (from r105903) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:53:31 +00:00
Ingo Schommer
3b4d0a7422 ENHANCEMENT: Added method for $this->request->latestParam() backwards compatibility with Director::urlParam() (from r105890) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112508 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:53:11 +00:00
Ingo Schommer
4c2ff4bd0a APICHANGE: refactored methods in session to use coding conventions (from r105756) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112502 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:50:43 +00:00
Ingo Schommer
9c68b954fd BUGFIX More specific regex in Requirements->includeInHTML() to avoid duplicating information by matching HTML5-style <header> tags instead of <head> (fixes #5640) (from r105667) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112500 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:49:52 +00:00
Ingo Schommer
2943c75156 MINOR Using ASSETS_DIR and THEMES_DIR constant in Image, ManifestBuilder, Requirements, File (fixes #5619) (from r105282) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112493 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:37:41 +00:00
Ingo Schommer
a3cf47f5ec BUGFIX Stricter object type checks in ViewableData->hasValue() and ViewableData->XMLval(). Broke in cases when SS_HTTPResponse is returned which doesn't extend from Object, hence doesn't have an exist() method (fixes #5524, thanks hamish) (from r105278) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112477 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:30:57 +00:00
Ingo Schommer
6354ea50c3 MINOR Documentation (from r105188) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112442 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:27:01 +00:00
Ingo Schommer
59883d7770 MINOR: increased height of the todo text field in the cms (from r105139) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112441 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:26:44 +00:00
Ingo Schommer
8d07a8eccc MINOT Translation in SiteTree (#5603, thanks Pike) (from r105057) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112439 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:24:43 +00:00
Ingo Schommer
0b3ff09e7e MINOR Checking for headers_sent() before setting cookies in Versioned::choose_site_stage() to avoid problems with URL parameters like showqueries=1 and ContentController calling choose_site_stage() (fixes #5557) (from r105027) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112435 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:22:25 +00:00
Ingo Schommer
8d27740cf9 MINOR Documentation (from r105011) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112431 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:22:05 +00:00
Ingo Schommer
72abcd09f6 MINOR Documentation (from r105009) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112428 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:21:50 +00:00
Ingo Schommer
352d308339 MINOR Documentation (from r105005) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112426 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:21:28 +00:00
Ingo Schommer
a66c1590ba MINOR Documentation (from r104996) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112423 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:21:12 +00:00
Ingo Schommer
0a261fd479 BUGFIX Fixed i18nTextCollector when used with i18nEntityProvider - class manifest is now stored lowercase, which means i18n::get_owner_module() didnt work reliably (from r104995) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112421 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:20:42 +00:00
Ingo Schommer
4f798d4d12 MINOR Removed duplicated code in i18nTextCollector, more defensive checks for get_owner_module() (from r104992) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112419 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:19:58 +00:00
Ingo Schommer
a213ce7839 MINOR Allowing translation of "save" button in SiteConfig->getCMSActions() (from r104978) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112418 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:19:24 +00:00
Ingo Schommer
aa4fc0a3db ENHANCEMENT: added Month function for consistency (from r104935) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112409 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:17:45 +00:00
Ingo Schommer
e5f41ca3e0 MINOR Fixed hidden mbstring reliance in SiteTree->generateURLSegment() (broken in r104679) (from r104883) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112403 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:16:47 +00:00
Ingo Schommer
c0d0631c3b BUGFIX: catch case of plugin not returning translations for the locale (from r104847) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112399 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:16:31 +00:00
Ingo Schommer
0eccb61c17 ENHANCEMENT: added plugins to i18n to support modules that provide custom translations. (from r104827) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112395 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:15:54 +00:00
Ingo Schommer
94032c6e3e MINOR Documentation (from r104795) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112381 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:12:56 +00:00
Ingo Schommer
5dc8b97217 MINOR Documentation (from r104769) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112380 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:12:41 +00:00
Ingo Schommer
0b6feffd4c MINOR Documentation (from r104767) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112379 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:12:22 +00:00
Ingo Schommer
fdb03c4d8c MINOR: fixed umlauts (from r104733) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112377 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:11:07 +00:00
Ingo Schommer
0e4573d5ab MINOR: fixed api doc (from r104682) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112372 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:04:34 +00:00
Ingo Schommer
eb0de3cd70 MINOR Fixed merge error from r112365 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112371 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:03:43 +00:00
Ingo Schommer
c5196c9358 BUGFIX: Make URLs lowercase (from r104679) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112367 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:41:14 +00:00
Ingo Schommer
c9563c48b7 BUGFIX: Fixed Translatable::canEdit() to suit new permission customisation scheme (from r104678) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112366 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:40:59 +00:00
Ingo Schommer
3135c96fc9 ENHANCEMENT: Macrons, umlauts, etc, are now transliterated when inserted into URLS. API CHANGE: Added Transliterator class, which uses iconv() or strtr() to convert characters with diacritical marks to their ASCII equivalents. API CHANGE: Added Extension hook updateURLSegment for SiteeTree. (from r104671) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112365 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:39:36 +00:00
Ingo Schommer
2b65c57f7c BUGFIX: Director::test() shouldn't break if $_SESSION isn't set. (from r104670) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112364 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:34:18 +00:00
Ingo Schommer
3ece3026d1 API CHANGE: Moved site tree permission extension to a 3-state system (true, false, null, where null means "no effect") (from r104669) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112363 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:33:48 +00:00
Ingo Schommer
deb533238c BUGFIX: Generate stage/live links using Controller::join_links() instead of string concatenation. (from r104581) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112353 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:29:53 +00:00
Ingo Schommer
9cc825e769 BUGFIX: Fixed Controller::join_links() handling of fragment identifiers (from r104580) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112352 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:29:29 +00:00
Ingo Schommer
4b3fa8f479 MINOR Documentation (from r104483) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112350 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:28:24 +00:00
Ingo Schommer
971d0f108f BUGFIX: When finding an old page in the 404 handler, favour existing subpages over historical ones. (from r104468) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112349 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:28:02 +00:00
Ingo Schommer
253c27e2a8 BUGFIX: Fix legacy URL redirection for pre-nestedurls URLs, after it has been enabled. (from r104463) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112347 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:05:18 +00:00
Ingo Schommer
32afc2923e MINOR Migrated various API-style documentation from doc.ss.org (from r104157) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112337 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:58:09 +00:00
Ingo Schommer
0fe3528768 MINOR Documentation for DB::manipulate() (moved from http://doc.silverstripe.org/manipulation-arrays) (from r104121) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112336 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:57:40 +00:00
Ingo Schommer
d50097e905 FEATURE: Add dev/build/defaults to call requireDefaultRecords (from r104093) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112334 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:57:02 +00:00
Ingo Schommer
ea32270eac MINOR: Recognize and allow HTTP/422 response code (from r104092) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112333 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:56:33 +00:00
Ingo Schommer
2bab8c8729 BUGFIX ViewableData->castingClass() cuts off last character of a casting definition if it has bracketed arguments (fixes #5536, thanks ajshort) (from r104063) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112331 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:56:11 +00:00
Ingo Schommer
80f609ee41 BUGFIX Fixed Database->requireTable() for Mysql 4.1 (fixes #5517, thanks gw0) (from r103957) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112326 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:52:16 +00:00
Sam Minnee
ce06320134 BUGFIX: Better handling off calling Controller redirect() methods when handleRequest() hasn't been called. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112234 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 04:59:22 +00:00
Sam Minnee
0c81b2f997 APICHANGE: changed the modulus offset to 1 to correctly order sets (from r103792) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112158 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 04:05:04 +00:00
Sam Minnee
0b4e4428be MINOR: Merges from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112157 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 04:04:32 +00:00
Sam Minnee
8da5de8d41 BUGFIX: Fixed ordering by aggregate columns for DataObject::get() calls with joins. (from r103620) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 04:00:52 +00:00
Sam Minnee
2c4b07ace7 BUGFIX: Fixed unlimitedRowCount() for grouped queries (from r103613) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 04:00:14 +00:00
Sam Minnee
5027bf83ab BUGFIX: Ensure that group by of many-many queries with extraFields is set correctly. (from r103612) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112153 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:59:44 +00:00
Sam Minnee
297b00606a MINOR: recache tables if cache is empty (from r103606) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112152 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:59:16 +00:00
Sam Minnee
712680a5e8 BUGFIX #5362: Fixed duplicate removal on DataObject:get() with join argument for all databases. (from r103588) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112150 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:58:10 +00:00
Sam Minnee
60cd41a03b ENHANCEMENT Added i18n::set_default_locale() to set standard locale (which is different from "current locale" retrieved through i18n::get_locale()) (from r103581) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112148 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:57:31 +00:00
Sam Minnee
752869e23b BUGFIX Renamed Nested URLs are automatically redirected to their new location with 301 HTTP status code in ModelAsController/ContentController (fixes #5393, thanks cbarberis) (from r103461) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112144 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:55:34 +00:00
Sam Minnee
2948bc1c64 MINOR: Misc merges from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112142 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:53:12 +00:00
Sam Minnee
90514f2ae3 BUGFIX: Don't show error when adding default SiteConfig records after upgrading a site. (from r103341) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112134 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:44:14 +00:00
Sam Minnee
1379f133ea MINOR Enum DBField class should default to ExactMatchFilter to avoid wrong results with overlapping Enum values in LIKE queries (see #5434) (from r103322) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112132 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:40:36 +00:00
Sam Minnee
49496e5c4b BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:40:05 +00:00
Sam Minnee
5cb4090145 BUGFIX: r101093 broke casting of values from the failover object. Add lookup to the failover for casting info, and add test (from r103240) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112127 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:38:23 +00:00
Sam Minnee
37f18971c5 ENHANCEMENT: allow onAfterPublish and onBeforePublish handlers directly on Page classes (#5112) (from r103198) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112124 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:35:19 +00:00
Sam Minnee
6387f735e3 BUGFIX Only replace double slashes in SS_HTTPRequest->__construct() for relative- its a failsafe against wrongly formatted URLs like 'admin//assets' instead of 'admin/assets', but breaks absolute URLs with 'http://' prefix (from r103099) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112120 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:31:53 +00:00
Sam Minnee
4db5dd3e47 MINOR: fixed the error message on class conflict (#5439, patch submitted by rorschach) (from r103093) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:31:22 +00:00
Sam Minnee
eef3ff8021 BUGFIX: disallow numeric actions - numeric array indexes are incorrectly picked up as allowed actions (#5331) (from r103092) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112118 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 03:30:54 +00:00
Sam Minnee
0914dd55c5 ENHANCEMENT: allow to check for any changed fields on the DataObject, this is expected behaviour when isChanged function is called without parameters (#5421, patch by walec51) (from r103047) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112072 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:48:48 +00:00
Sam Minnee
961d4ce298 BUGFIX: added optional separator for http_build_query in HTTP:setGetVar(). this fixes sorting columns in ModelAdmin (ticket #5325). (from r103012) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112071 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:48:24 +00:00
Sam Minnee
83f117f58c MINOR Using canView() instead of deprecated can('view') in ContentController (from r102909) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112070 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:46:33 +00:00
Sam Minnee
64a561f96c BUGFIX Fixing RquestHandler->checkAccessAction() on PHP 5.2 - ReflectionMethod->class returns inconsisent results in older PHP versions. (see r102003) (from r102730) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112069 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:46:02 +00:00
Sam Minnee
322a2da0dc BUGFIX Float should always be not null and default 0 in the database (from r102686) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112068 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:45:24 +00:00
Sam Minnee
268800dec6 BUGFIX #5316 Float and Double should never try to save NULL as the "null" value (from r102460) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112067 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:43:58 +00:00
Sam Minnee
29edff8c38 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364) (from r102386) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112065 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:41:14 +00:00
Sam Minnee
890ac94a6a MINOR: Several changes merged from branches/2.4 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112060 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:35:19 +00:00
Sam Minnee
ddf66c1fec BUGFIX Fixed SiteTree::page_type_classes() removal of base class (was broken if database driver returned classes in arbitrary order, e.g. in Postgres) (from r102026) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112058 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:28:02 +00:00
Sam Minnee
e8e7065ff4 MINOR Fixed indentation (from r102009) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112055 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:26:16 +00:00
Sam Minnee
1d61bf7100 BUGFIX Prevent handling of controller actions which return $this avoid infinite loops in RequestHandler->handleRequest (thanks Hamish!) (from r102004) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112054 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:24:53 +00:00
Sam Minnee
740e49061f API CHANGE Disallow methods/actions in RequestHandler->checkAccessAction() which are implemented on parent classes (e.g. ViewableData and Object), unless access is controlled through $allowed_actions. This limits information exposure from getters used in template contexts. (from r102003) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112053 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:24:15 +00:00
Sam Minnee
28c2c67355 BUGFIX Checking for existing redirections in FormResponse::respond (fixes #5208) (from r101958) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112050 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:21:45 +00:00
Sam Minnee
daa50b9d3b BUGFIX: Ensure that DataObject IDs are numbers and no string equivalents of numbers - 3 not '3' (from r101939) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112049 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:19:33 +00:00
Sam Minnee
bbdad4207f MINOR take advantage of an alternate path for error pages (from r101883) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112048 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:18:35 +00:00
Sam Minnee
34207e069a BUGFIX #4188 simon_w: Let require tags in templates be conditional (from r101867) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112044 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:15:47 +00:00
Sam Minnee
3ba0434d6d BUGFIX: Recover if a manifestClassParse file doesn't have the necessary content. (from r101866) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112043 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:15:13 +00:00
Sam Minnee
c5c7dee5f0 API CHANGE: Allow cached blocks within control and if blocks, as long as that control or if block is contained within an uncached block, not a cached block (from r101833) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112042 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:14:49 +00:00
Sam Minnee
ca5c2323a1 BUGFIX: preserve the port value if given in HTTP::setGetVar (#5280). BUGFIX: allow username only input rather than user:pass combo. (from r101793) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112037 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:08:10 +00:00
Sam Minnee
2996e2a60d BUGFIX: disable function re-enabled (from r101792) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:07:35 +00:00
Sam Minnee
dad17e2330 MINOR Marked DataObject::has_own_table() as static (from r101782) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112034 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:06:47 +00:00
Sam Minnee
9087f79723 BUGFIX Always including "Locale" field in Translatable->getCMSFields() regardless of "excluded" page types. Necessary to enable form state serialization for fields like TreeSelectorField on a VirtualPage (fixes #5269) (from r101747) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112031 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:05:08 +00:00
Sam Minnee
fd8e0044c4 BUGFIX Versioned->publish() with $createNewVersion=TRUE now increases version number of in-memory object (fixes #5261) (from r101739) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112030 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:04:38 +00:00
Sam Minnee
142bb640ec BUGFIX #5277 Sort of default SiteTree records is now explicitly set to avoid strange ordering set by SiteTree::onBeforeWrite for default records (from r101724) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112028 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:03:25 +00:00
Sam Minnee
1bbec96aa1 BUGFIX Don't replace "home/" URLSegment in SiteTree->RelativeLink() if Translatable is enabled and the homepage is not on the root level (nested URLs allows you to have homepages called "en/home" and "ru/home") (fixes #5244) (from r101711) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112025 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:01:38 +00:00
Sam Minnee
6ba32686b1 MINOR Reverted r101670 as it broke assumptions made in RedirectorPageTest (from r101671) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112018 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:39 +00:00
Sam Minnee
6490b111b6 ENHANCEMENT RedirectorPage ExternalURL field now defaults to http:// to be consistent with the "Another website" option for HtmlEditorField LinkForm (from r101670) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112017 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:20 +00:00
Sam Minnee
7d3d9a005e BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found (from r101668) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112016 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:57:45 +00:00
Sam Minnee
c08e277ba0 BUGFIX #5245 Sometimes page records will have a NULL ParentID value, it should be a number even if it's 0 (thanks wrossiter!) (from r101657) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112014 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:56:27 +00:00
Sam Minnee
4414b8a747 BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb! 
MINOR Updated ViewableDataTest to verify ViewableData changes (from r101638)

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

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111974 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:56:06 +00:00
Sam Minnee
8f41e08139 BUGFIX: Don't recreate a missing draft page when calling SiteTree::doUnpublish() (from r101170) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111967 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:49:52 +00:00
Sam Minnee
dd7bba3f6f BUGFIX: Fixed versioning of pages (from r101165) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111964 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:48:48 +00:00
Sam Minnee
c6b8148052 BUGFIX: Prevent failed migrateVersion writes from breaking versioning system in future writes. 
BUGFIX: MAke site tree pages go green when you save a new draft.
API CHANGE: Add option for DataObjectDecorator::onAfterSkippedWrite() (from r101155)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111963 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:48:07 +00:00
Sam Minnee
7d248e6835 BUGFIX #5214 ViewableData::obj() was creating a DBField without a fieldname argument and caused problems, one example is the version panel of the CMS (from r101154) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111962 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:47:48 +00:00
Sam Minnee
79459d72ad BUGFIX: Ensure that Versioned works on classes with underscores in the names. (from r100905) (from r101153) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111961 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:42:45 +00:00
Sam Minnee
e09cc66e94 BUGFIX: Fixed issues with broekn link tracking (from r101138) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111960 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:42:25 +00:00
Sam Minnee
5e00afc9c8 API CHANGE: Partial cache adjustments - now supports nested cache blocks (which are independant of their containing cache block), conditionals to control if a given cache block is active, and includes hash of template code in key (so template changes mean cache is invalidated). Changes template control for cache block to <% cached %>, to which the now deprecated <% cacheblock %> is aliased, and an additional template control <% uncached %> has been added. (from r101137) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111959 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:41:48 +00:00
Sam Minnee
3650b571fc BUGFIX: Allow classes to be referred to with casing that differs from their definition. (from r101131) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111958 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:41:13 +00:00
Sam Minnee
ab46f9d2b1 BUGFIX ManifestBuilder::up_children() should be declared as static as it's called statically (from r100918) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:39:57 +00:00
Ingo Schommer
3f2cc791ac MINOR More common language in Date->TimeDiff() ("in 2 hours" instead of "2 hours away") (fixes #5402) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111840 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-10 05:06:50 +00:00
Sam Minnee
d19bf168b0 API CHANGE: Added SiteTree::VirtualPages() and SiteTree::DependentPages() accessors. 
BUGFIX: Improved reliabilty of broken link tracking.
ENHANCEMENT: Added 'Dependent pages' tab to CMS, to show virtuals, redirectors, and backlinks that point to this page.
BUGFIX: Don't mark a page as changed on stage if the only thing that has changed is broken link metadata (from r101127)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111594 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:52:46 +00:00
Sam Minnee
bfc354ab7e BUGFIX: Flush cache after deleting an item. 
BUGFIX: Fixed databaseFieldsOnly version of DataObject::getChangedFields() (from r101116)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:50:43 +00:00
Sam Minnee
7426ce027c BUGFIX: Fixed bugs with copying custom fields into Virtual pages, generally made virtual pages more robust and performant. (from r101112) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:49:37 +00:00
Sam Minnee
e2b6291a30 BUGFIX: Fixed link rewriting to work on other HTMLText fields (from r99517) (from r101110) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111590 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:48:47 +00:00
Sam Minnee
ca0550bb3a BUGFIX: Return true if SiteTree:doUnpublish() succeeds. (from r99515) (from r101109) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111589 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:48:07 +00:00
Sam Minnee
3db905bc42 BUGFIX: Update Object::parse_class_spec() to handle arrays. (from r101105) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111587 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:47:08 +00:00
Sam Minnee
310272bc7e BUGFIX: call_user_func_array changed to PHP 5.1 compatible notation (from r101099) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111586 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:46:55 +00:00
Sam Minnee
cc355a4f18 API CHANGE: Replaced eval based creation of extension and field objects with Object::create_from_string(). 
API CHANGE: Introduced new function Object::create_from_string() to instantiate an object from a string like 'Int(50)' (from r101093)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111585 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:46:41 +00:00
Sam Minnee
9f2ca79c67 BUGFIX Cookies set to a value other than NULL (effectively unsetting the cookie) will now use the httpOnly parameter by default for better XSS protection (from r101045) (from r101046) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111570 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:40:50 +00:00
Sam Minnee
ce173efce3 API CHANGE: Made MySQL fulltext search optional, activated with MySQLFulltextSearchable::enable() (from r101044) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111569 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:32:48 +00:00
Sam Minnee
ec067ab08a API CHANGE: Pass the full extension string as the 2nd argument to DataObjectDecorator::extraStatics() (from r101043) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111568 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:32:30 +00:00
Sam Minnee
47df057e63 BUGFIX Image should pass through the title to Image_Cached so that Image::getTag() can produce a more useful alt attribute instead of just the filename (from r101003) (from r101005) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111565 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:30:56 +00:00
Sam Minnee
2154e0585d MINOR Removed unused variable in SiteTree::MetaTags() (from r100992) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111563 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:30:26 +00:00
Sam Minnee
2e66aff365 BUGFIX: Fixed file-write testing issues in requirements combined file generation (from r100982) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111556 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:28:48 +00:00
Sam Minnee
32038ab3ce BUGFIX: Remove cache for Hierarchy::AllChildren() and Hierarchy::AllChildrenIncludingDeleted(), since they increase memory usage unnecessarily. (from r100980) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111555 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:28:32 +00:00
Sam Minnee
dd44a010cf BUGFIX: Don't make CMS loading slow if the combined javascript files can't be written. (from r100979) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111554 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:28:02 +00:00
Sam Minnee
059866556a MINOR Renamed SiteTree->getEditFormFields() to getCMSFields() (including new decorator hook for 'updateCMSFields'). Renamed SiteTree->getEditFormActions() to getCMSActions() (including new decorator hook for 'updateCMSActions'). Old API was never released (from r100967) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111551 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:27:23 +00:00
Sam Minnee
94d98b18ac ENHANCEMENT Redirecting to translated page when original is requested with a 'locale' GET parameter (e.g. 'about-us/?locale=de_DE' will redirect to 'ueber-uns' with a 301 HTTP response). Implemented in ContentController->handleRequest(). (see #5001) (from r100937) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111545 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:24:01 +00:00
Sam Minnee
37bc333882 BUGFIX SiteTree::getSiteConfig() should always fall back to using a default if an alternate config wasn't found (from r100932) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111544 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:21:59 +00:00
Sam Minnee
ee81852097 MINOR Fixed phpDoc argument in ViewableData::hasValue() (from r100922) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111542 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:21:32 +00:00
Sam Minnee
2e49064341 BUGFIX DataObject::hasValue() is now compatible with parent ViewableData::hasValue() (this also fixes E_STRICT standards in PHP) (from r100921) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111541 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:21:06 +00:00
Sam Minnee
ddce6c2210 BUGFIX RequestHandler::handleRequest is now compatible with Controller::handleRequest in that SS_HTTPRequest is the type hint for the $request parameter (from r100919) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111540 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:20:49 +00:00
Sam Minnee
aa7d2449d9 BUGFIX Produce XHTML compliant URLs in HTTP::setGetVar() by default (regression from r98373, see #5101) (from r100904) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111538 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:16:47 +00:00
Sam Minnee
a9ab6321bc BUGFIX #5138: DataObjectSet::removeDuplicates() removes objects of different classes with the same ID (from r100896) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111535 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:15:33 +00:00
Julian Seidenberg
6c541940e4 MINOR: updated comments on new methods that duplicate relations to be compatible with PHPDoc 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110909 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-09-17 02:27:44 +00:00
Julian Seidenberg
c32a6e34a0 BUGFIX: fix to #110845 to allow parsing of the DataObject file in PHP 5.2 and below. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-09-16 05:53:16 +00:00
Julian Seidenberg
ed666b71b7 ENHANCEMENT: DataObject and SiteTree duplicate now duplicate relations (except for has_many relations, as the object at the other end of such a relation has an existing relation to the original object and that should not be modified by the duplication) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@110845 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-09-16 03:40:34 +00:00
Andreas Piening
4ea1e6e3c1 BUGFIX Use "wb" argument in ManifestBuilder fopen() calls for better cross-platform compatibility (from r100862) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108830 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-08-03 03:50:43 +00:00
Andreas Piening
ccda3bbc20 BUGFIX #5157 If paths are longer than 255 characters, fopen() produces an "Invalid argument" error, shorten the paths by using basename() instead of realpath() on the manifest filename when producing the cache path in ManifestBuilder (from r100861) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108814 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-08-03 02:24:17 +00:00
Andreas Piening
e59e0431e4 MINOR: Director::currentPage() is deprecated but shouldn't throw a notice-level error until the next major release. (from r100670) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108761 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-08-02 00:43:51 +00:00
Ingo Schommer
53b02f6d99 BUGFIX Moved SiteTree?->ParentID property to Hierarchy extension (fixes #5638) (from r105668) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105786 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-27 21:29:48 +00:00
Ingo Schommer
06f18485a9 MINOR Improved help texts around permissions (from r100784) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105651 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 05:02:08 +00:00
Ingo Schommer
9f6bf696c6 MINOR dont copy embargo or expiry to virtual page (from r100772) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105648 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:59:45 +00:00
Ingo Schommer
5c965330c3 ENHANCEMENT you can now choose your site locale at install time (from r100769) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105645 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:58:00 +00:00
Ingo Schommer
a0d1c7d2b1 BUGFIX: Date::now() supplies wrong string - it misses leading zeroes on hours (from r100767) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105644 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:57:43 +00:00
Ingo Schommer
0a91f30722 BUG FIX: column names quoted properly (from r100690) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105621 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:22:50 +00:00
Ingo Schommer
96ebc35cee BUG FIX: column names quoted properly (from r100687) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105620 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:22:35 +00:00
Ingo Schommer
f661501019 BUG FIX: the default value for decimals are now cast as (doubles) (from r100686) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105619 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:22:21 +00:00
Ingo Schommer
6f936bf10d API CHANGE: dbDataType function created (from r100651) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105616 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:21:21 +00:00
Ingo Schommer
25c2b79718 BUGFIX DB::getConnect() should be properly declared as a static function (from r100627) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105615 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:21:07 +00:00
Ingo Schommer
4ec18cc701 MINOR Cookie - removed unncessary extending of Object since this class only has a bunch of static functions (from r100625) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:19:57 +00:00
Ingo Schommer
2e5b68174a MINOR Convert - removed unncessary extending of Object since this class only has a bunch of static functions (from r100624) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105611 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:19:38 +00:00
Ingo Schommer
3f14112a62 MINOR ArrayLib - removed unncessary extending of Object since this class only has a bunch of static functions (from r100623) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105610 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:19:23 +00:00
Ingo Schommer
0dd37f0da9 MINOR Removed double slashes from path in Requirements_Backend::process_combined_files() (from r100618) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105608 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:19:00 +00:00
Ingo Schommer
f3ce3e1e85 BUGFIX Fixed filemtime() check in Requirements_Backend::process_combined_files() not getting the right path (from r100616) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105607 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:48 +00:00
Ingo Schommer
3ac0edc117 MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is (from r100615) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105606 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:29 +00:00
Ingo Schommer
86e799f008 BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files() (from r100614) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105605 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:14 +00:00
Ingo Schommer
94801d75ff ENHANCEMENT Stored combined files in assets/_combinedfiles by default (from r100536) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105600 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:17:05 +00:00
Ingo Schommer
656eccc7a4 MINOR Removed Requirements:: static call and replace with instance (from r100533) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105598 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:16:33 +00:00
Ingo Schommer
9a438d26b0 ENHANCEMENT #3387 Requirements now has a new static function called Requirements::set_combined_files_folder() for setting where the combined files should belong (from r100528) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105596 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:15:43 +00:00
Ingo Schommer
7d8ac7662b MINOR Removed end php tag for Requirements and RequirementsTest (from r100514) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:14:00 +00:00
Ingo Schommer
9c03cc7fe1 API CHANGE Refactored Requirements to use Requirements_Backend at all times - this makes testing far easier. Thanks tobych! 
MINOR Updated RequirementsTest to test Requirements_Backend instead of global statics (from r100513)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105590 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:13:45 +00:00
Ingo Schommer
593448929a MINOR can always create top level if admin (from r100511) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105588 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:12:51 +00:00
Ingo Schommer
a1d9d8b890 API CHANGE Removed deprecated Image::loadUploaded() (deprecated from the parent::loadUploaded for which it called), please use Upload directly instead! (from r100498) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105587 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:12:31 +00:00
Ingo Schommer
56ba78b2a5 API CHANGE Removed deprecated function RootURLController::get_homepage_urlsegment(), please use RootURLController::get_homepage_link() instead! (from r100493) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105579 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:58:22 +00:00
Ingo Schommer
046dd623be API CHANGE Removed deprecated function SiteTree::get_by_url(), please use SiteTree::get_by_link() instead! (from r100492) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105578 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:57:46 +00:00
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
584e8a5ee6 MINOR Changed @deprecated note for Director::redirectBack to 2.5 as it's still widely used (from r100483) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105573 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:54:29 +00:00
Ingo Schommer
dd7e7f813d MINOR Fixed regression of Convert::json2obj() not working when json_decode() is being used (from r100461) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105571 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:53:58 +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
f7c34fc73c MINOR phpDoc bits for Convert Services_JSON functions (from r100424) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105568 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:52:56 +00:00
Ingo Schommer
30b2a950fe ENHANCEMENT Convert JSON functions now use the Services_JSON library where appropriate instead of custom code, and if json_decode() or json_encode() are available these are used 
MINOR Added unit tests for Convert JSON functions (from r100423)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105567 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:52:38 +00:00
Ingo Schommer
ffa1267516 BUGFIX: Fix mismatch with $all_locales and $common_locales (#5096) (from r100406) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105560 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 03:50:19 +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
36d7efb95c BUGFIX #4974: Improve accuracy of ManifestBuilder::parse_file() cache, to remove a source of upgrade bugs. (from r99738) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102877 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-14 05:36:56 +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