Commit Graph

496 Commits

Author SHA1 Message Date
Andrew O'Neil
4d616597ad Merged revisions 56253 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r56253 | sminnee | 2008-06-16 12:05:35 +1200 (Mon, 16 Jun 2008) | 1 line
  
  Reference javascripts with absolute URLs so that IE6 doesn't break on base tags in certain situations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:02:07 +00:00
Andrew O'Neil
172bf71ead Merged revisions 54472 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r54472 | aoneil | 2008-05-13 21:11:42 +1200 (Tue, 13 May 2008) | 2 lines
  
  BUGFIX #2504 - Fixed translation interface not working in CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56906 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 03:58:21 +00:00
Ingo Schommer
4693ca4ba7 MINOR Moving Mailer.php into /email
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 14:07:14 +00:00
Ingo Schommer
43d6ac89e9 MINOR Moving Email.php into /email
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 14:06:47 +00:00
Ingo Schommer
d0d6711f22 MINOR Moving SapphireInfo into /dev folder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 14:06:06 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sean Harvey
b96608e0a3 API CHANGE Email_Template class deprecated, Email should be used from now on.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-12 09:29:05 +00:00
Mark Rickerby
327b4610d5 moving Debug.php to dev folder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-06 04:59:49 +00:00
Sam Minnee
5dff780a5d API CHANGE Added FunctionalTest::
API CHANGE Added ->session()
API CHANGE Added FunctionalTest::
API CHANGE Improved FunctionalTest's match by selector commands to produce less brittle output (rationalises whitespace)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-26 06:21:30 +00:00
Sam Minnee
98bee3e50f BUGFIX: Make ModelAsController 404 result more testable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-15 08:44:37 +00:00
Mark Rickerby
8e31456185 FEATURE added a Year field to work with MYSQL's built in year type.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-14 05:54:11 +00:00
Sam Minnee
b0c384d6c1 Merged revisions 53150,53681,53700,53820,54200,54459 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/roa

........
  r53150 | ischommer | 2008-04-22 11:12:43 +1200 (Tue, 22 Apr 2008) | 1 line
  
  FEATURE Added a "test mode" for /db/build which allows mock-DataObject-subclasses which are just built in a test run
........
  r53681 | mrickerby | 2008-04-29 15:26:52 +1200 (Tue, 29 Apr 2008) | 1 line
  
  adding default wrapping header and footer methods, and configurable reporting to the TestRunner
........
  r53700 | mrickerby | 2008-04-29 16:41:57 +1200 (Tue, 29 Apr 2008) | 1 line
  
  FEATURE: adding support for /dev/tests --> DevelopmentAdmin-->tests() --> TestRunner, /dev/tasks --> DevelopmentAdmin-->tasks() --> TaskRunner
........
  r53820 | mrickerby | 2008-04-30 19:27:52 +1200 (Wed, 30 Apr 2008) | 1 line
  
  BUGFIX fixing up BuildTask interface and task runner action
........
  r54200 | sminnee | 2008-05-09 00:28:44 +1200 (Fri, 09 May 2008) | 1 line
  
  Added TestSession object to help with the testing of forms
........
  r54459 | sminnee | 2008-05-13 17:28:25 +1200 (Tue, 13 May 2008) | 1 line
  
  Added a basic menu of options to /dev
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-13 05:57:09 +00:00
Ingo Schommer
c60be4238c MINOR changed Tag() to getTag() to allow for field casting and unified getting (e.g. in TableListField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-10 02:21:26 +00:00
Ingo Schommer
d2f13f90e9 API CHANGE Removed import() and generateProductGroups() from DatabaseAdmin - custom code for ecommerce module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@54162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-08 00:27:09 +00:00
Geoff Munn
2ea476d90b test for db/build error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53575 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-28 02:24:40 +00:00
Sam Minnee
dbe5bba3d3 Merged revisions 53373 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53373 | wrossiter | 2008-04-24 09:57:16 +1200 (Thu, 24 Apr 2008) | 1 line
  
  Don't mark a test site as being in dev mode if set_test_servers matches
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:55:11 +00:00
Sam Minnee
f427047b9d Merged revisions 53075 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53075 | sminnee | 2008-04-21 10:56:46 +1200 (Mon, 21 Apr 2008) | 1 line
  
  Made has_one, has_many, and many_many methods more reliable
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:23 +00:00
Sam Minnee
1bc00f4b2d Merged revisions 53066 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r53066 | sminnee | 2008-04-21 10:14:48 +1200 (Mon, 21 Apr 2008) | 2 lines
  
  Make double-redirects a warning rather than an error, since they are usually benign.
  Don't redirect from /home to / if you've already called a redirection.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:53:13 +00:00
Sam Minnee
8a5b360abd Merged revisions 52719 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52719 | sminnee | 2008-04-15 11:56:10 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed ContentController where ->dataRecord is empty
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:59 +00:00
Sam Minnee
45804905ed Merged revisions 52452 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52452 | sminnee | 2008-04-10 13:59:09 +1200 (Thu, 10 Apr 2008) | 1 line
  
  Don't strtolower ->action, as it had too many side-effects.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:49 +00:00
Sam Minnee
8b508319ab Merged revisions 52448 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52448 | sminnee | 2008-04-10 13:50:28 +1200 (Thu, 10 Apr 2008) | 1 line
  
  #2387 - Fields specified in DataObjectDecor not saved in some cases
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:52:36 +00:00
Sam Minnee
b9b4a1e2b2 Merged revisions 52398 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52398 | sminnee | 2008-04-09 18:19:30 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:51:18 +00:00
Sam Minnee
eae79ab0de Merged revisions 52391 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52391 | sminnee | 2008-04-09 17:58:21 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Show security id errors on test sites as well as dev
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53512 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:49:14 +00:00
Sam Minnee
d9998f2684 Merged revisions 52350 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52350 | sminnee | 2008-04-09 12:35:52 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Improved behaviour of contentcontrollerInit when extensions are applied to subclasses of SiteTree
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:49:01 +00:00
Sam Minnee
88d79d1b62 Merged revisions 52224 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52224 | sminnee | 2008-04-07 11:45:23 +1200 (Mon, 07 Apr 2008) | 1 line
  
  #2314 - Fixed SQLMap implementation so that Group::map() returns appropriate data, and the group dropdown on the access tab works.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:44:06 +00:00
Sam Minnee
b836bc7825 Merged revisions 52933 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52933 | sminnee | 2008-04-17 18:37:21 +1200 (Thu, 17 Apr 2008) | 1 line
  
  ImageUploader fields are accessible by CMS_ACCESS_CMSMain, rather than ADMIN
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:36:23 +00:00
Sam Minnee
f82b03c74d Merged revisions 52616 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52616 | sminnee | 2008-04-13 16:56:58 +1200 (Sun, 13 Apr 2008) | 1 line
  
  Added email testing support to SapphireTest
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:32:31 +00:00
Sam Minnee
eb60b67732 Merged revisions 52121 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52121 | sminnee | 2008-04-03 22:04:33 +1300 (Thu, 03 Apr 2008) | 4 lines
  
  Added DataObject::validate() for specifying DataObject-level validators.
  Added DataObject::onAfterWrite(), a complement of DataObject::onBeforeWrite()
  Added password strength testing to security system
  Added password expiry to security system
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:52 +00:00
Sam Minnee
031ab93e97 Merged revisions 52120 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52120 | sminnee | 2008-04-03 21:40:18 +1300 (Thu, 03 Apr 2008) | 1 line
  
  Fix operation of Cookie::forceExpiry() during testing.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53464 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:36 +00:00
Sam Minnee
7759de7433 Merged revisions 52119 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/govtsecurity

........
  r52119 | sminnee | 2008-04-03 21:38:21 +1300 (Thu, 03 Apr 2008) | 1 line
  
  Improved operation of Director::test() when accessing ,,, directly.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53463 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:31:24 +00:00
Sean Harvey
a12cf06cc8 BUGFIX: Ticket #2327 - Merged patch fixing regex problem in Director::protocolAndHost()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 03:30:16 +00:00
Sean Harvey
130ead34cd FEATURE: Ticket #2198 - Merged patch making can() decoratorable by defining augmentCan()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:28:07 +00:00
Sean Harvey
6c342f7db5 FEATURE: Ticket #2408 - Merged patch to Convert::array2json() which makes uses of the PHP function json_encode when available
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:21:03 +00:00
Sean Harvey
081905485f FEATURE: Ticket #2418 - Merged in patch allow setting of currency symbol
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 02:12:26 +00:00
Sean Harvey
4a5443c5da ENHANCEMENT: Ticket #2382 - Merged patch changing 302 for /home to 301
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 01:45:55 +00:00
Ingo Schommer
aaac90c531 API CHANGE Making all parameters to Email::__construct() optional (they all have public setters/getters, don't necessarily need to be set at instanciation time, as used in e.g. NewsletterAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:27:27 +00:00
Mark Rickerby
e12f87ad38 When ClassInfo::dataClassesFor is passed an instance of the class, the method now automatically coerces the instance to a string of its name
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52675 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-14 04:49:08 +00:00
Ingo Schommer
b039104acc Merged revisions 52649 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/roa

........
  r52649 | ischommer | 2008-04-14 10:03:15 +1200 (Mon, 14 Apr 2008) | 1 line
  
  MINOR fixed php notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-13 22:05:03 +00:00
Ingo Schommer
f337b048e5 Merged revisions 50164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-nzct

........
  r50164 | hsmith | 2008-02-26 10:39:54 +1300 (Tue, 26 Feb 2008) | 1 line
  
  API CHANGE: Added DataObject::writeComponents. DataObject::write now has a flag to disable writing of components
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-10 01:43:31 +00:00
Ingo Schommer
109a9da3af Merged revisions 50265 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r50265 | ischommer | 2008-02-27 15:18:45 +1300 (Wed, 27 Feb 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52412 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:28:32 +00:00
Ingo Schommer
067d2a5804 Merged revisions 49406 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49406 | ischommer | 2008-02-12 12:10:06 +1300 (Tue, 12 Feb 2008) | 1 line
  
  checking for valid css media type
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52409 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:25:47 +00:00
Ingo Schommer
57ef489ffb Merged revisions 49405 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49405 | ischommer | 2008-02-12 12:09:50 +1300 (Tue, 12 Feb 2008) | 2 lines
  
  moved Email_Template functionality into Email class
  reordered methods in Email
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:25:06 +00:00
Ingo Schommer
15b3fb02b4 Merged revisions 48902 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48902 | ischommer | 2008-01-31 16:29:42 +1300 (Thu, 31 Jan 2008) | 1 line
  
  added documentation, using $data as array
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52406 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:20:34 +00:00
Ingo Schommer
7ae4a30885 Merged revisions 48361-48363 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48361 | ischommer | 2008-01-21 21:05:53 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........
  r48362 | ischommer | 2008-01-21 21:07:13 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........
  r48363 | ischommer | 2008-01-21 21:07:43 +1300 (Mon, 21 Jan 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:17:39 +00:00
Ingo Schommer
823916f7a2 Merged revisions 47488 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47488 | ischommer | 2007-12-21 16:03:04 +1300 (Fri, 21 Dec 2007) | 1 line
  
  in fileExists(): replace any appended query-strings, e.g. /path/to/foo.php?bar=1 to /path/to/foo.php
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 10:59:30 +00:00
Sam Minnee
5e8597bf0a Added TokenisedRegularExpression for accurate parsing of class files for the manifest. To make it efficient, the parse results of each file are now cached.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52320 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-08 06:17:58 +00:00
Ingo Schommer
a4d9521c3f Merged revisions 51944 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51944 | ischommer | 2008-04-01 15:43:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  ENHANCEMENT Using separate <script> tags for each customScript() requirements (necessary e.g. for google analytics inclusion)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-07 21:39:11 +00:00
Sam Minnee
b035abc6d3 #2380 - ManifestBuilder shouldn't recognise class definitions in comments and strings as real
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52239 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-07 04:42:35 +00:00
Ingo Schommer
6e85a576b5 ENHANCEMENT secured URL actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:09:59 +00:00
Ingo Schommer
72f6f06f44 Merged revisions 47614 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47614 | ischommer | 2008-01-04 19:15:18 +1300 (Fri, 04 Jan 2008) | 1 line
  
  stricter checking in loadUploaded()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 04:09:02 +00:00