Ingo Schommer
f4ae35b55a
BUGFIX Unset $default_session when using Session::clear_all()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:52 +13:00
Ingo Schommer
1b5ec9bd50
BUGFIX: Don't require a current controller for Session::get/set/etc to work.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:51 +13:00
Ingo Schommer
94f03523b5
ENHACENEMENT: Change behaviour of the MenufestBuilder to use spl_autoload_register instead of traditional __autoload.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:50 +13:00
Sean Harvey
ae89969321
BUGFIX Fixed column names that were not quoted that broke PostgreSQL
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:50 +13:00
Sean Harvey
92c04a6a1c
BUGFIX Fixed double quotes around column names in Versioned::augmentDatabase()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:50 +13:00
Will Rossiter
f9a84974b6
BUGFIX: delete orphaned records from versioned tables when updating. #5936
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:50 +13:00
Ingo Schommer
1ae4d04246
MINOR Avoid using ASP-style tags in SSViewer comments, it confuses PHP with asp_tags=ON ( fixes #5976 , thanks ezero)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:49 +13:00
Will Rossiter
1f0d664150
BUGFIX: ensure that pages can only be requested from staging and live
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:49 +13:00
Sean Harvey
c5bf8a31cb
ENHANCEMENT #5977 Added optional argument to ClassInfo::getValidSubClasses() and removed harcoded SiteTree
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:49 +13:00
Sean Harvey
d566ac4292
MINOR Warning about install.php existing for root site tree node as well (SiteConfig form)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:49 +13:00
Andreas Piening
0e156f1759
MINOR: added missing closing tag
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110243 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:49 +13:00
Sean Harvey
e65bfb893d
MINOR Make dev/build not constantly show a changed index because of whitespace between VersionID and Version in the index spec
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:48 +13:00
Andreas Piening
3a210c397a
MINOR: only call next() in iterator validation on initialisation or after reset NOT if current value is invalid
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:48 +13:00
Mateusz Uzdowski
0e60353e05
BUGFIX: makeRelative would return "false" for the root path, empty string is expected - fix that
...
BUGFIX: change the check in forceSSL to work on Windows - it sets the $_SERVER['https'] to off, instead of null
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:47 +13:00
Rainer Spittel
2d7b75d4cb
BUGFIX: getItem didn't consider the PostgreSQL SQL syntax. Columns with Capital letters must be quoted. Added quotes to the where clause in getItem. I didn't added quotes to the baseTable because it causes PostgreSQL errors (tables can not be double quoted, just single quoted).
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:47 +13:00
Andreas Piening
0226781e37
MINOR: neatly quote identifiers
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:47 +13:00
Luke Hudson
4311966880
Revert "MINOR: Applied patch from walec51 for <% control %> on empty set ( #5579 ) Also added unit tests by ischommer"
...
This was not supposed to be pushed out yet.
This reverts commit 9c2aafa414948314236674e31fd756797d695139.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:47 +13:00
Sean Harvey
0cbde73445
API CHANGE #5873 DataObjectSet::shift() now performs a proper shift instead of unshift (wrong). Please use DataObjectSet::unshift($item) if unshifting was intended!
...
API CHANGE Added DataObjectSet::pop()
MINOR Unit tests for DataObjectSet::shift(), DataObjectSet::unshift() and DataObjectSet::pop()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:46 +13:00
Sean Harvey
9d33d6abaa
MINOR Doc update for Director::forceSSL()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:46 +13:00
Luke Hudson
0e3bea57ce
MINOR: Applied patch from walec51 for <% control %> on empty set ( #5579 ) Also added unit tests by ischommer
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:46 +13:00
Sam Minnee
c488c6c93b
ENHANCEMENT Session::set_cookie_path() and Session::set_cookie_domain() are now possible. This is useful for sharing cookies across all subdomains, for example.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:45 +13:00
Sean Harvey
730725fe86
BUGFIX SiteTree decorated canView() checks not being passed through to SiteTree::canView()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:45 +13:00
Sean Harvey
34a4aa5b00
BUGFIX StringField::setNullifyEmpty() should assign the given value boolean, not evaluate whether it's true or not
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:45 +13:00
Andreas Piening
4659068c3f
MINOR: remove SQL table alias keyword AS
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:44 +13:00
Sean Harvey
8b8df80ccb
MINOR Fixed tests not working on the web side as redirection to https would occur
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:44 +13:00
Sean Harvey
7725426327
ENHANCEMENT #3828 500 server error page is created by default on dev/build
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108644 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:44 +13:00
Will Rossiter
de5462c9ef
MINOR: allow $icon to be overridden on ErrorPages. PATCH via martljn ( #5875 ).
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:44 +13:00
Sean Harvey
f9257a6035
ENHANCEMENT New Member records are populated with the currently set default through i18n::set_locale()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:43 +13:00
Sean Harvey
c7bef99190
BUGFIX Undefined variable destURL in Director::forceWWW() (regression from r107094)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:43 +13:00
Ingo Schommer
0d042e9a06
MINOR Making "todo" tab title translatable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:43 +13:00
Sean Harvey
54f6acfc21
MINOR Fixed Director::forceSSL() breaking unit tests because headers were already sent
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:43 +13:00
Sean Harvey
c52529215f
ENHANCEMENT #2856 Limiting of relative URLs for Director::forceSSL() using a map of PCRE regular expressions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:42 +13:00
Sean Harvey
b4101984e4
BUGFIX Fixed ContentNegotiator to handle HTML and XHTML base tags properly when converting, regression from r108413
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108421 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:42 +13:00
Ingo Schommer
92ab004781
ENHANCEMENT Added argument to SQLQuery->leftJoin()/innerJoin() ( #5802 , thanks stojg)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Carlos Barberis
fa65f5edce
ENHANCEMENT: Full-text search with double quotes returns too many results. ticket #5733 . Thanks ktauber.
...
Using htmlentities($keywords,ENT_NOQUOTES) instead of proposed solution
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Sean Harvey
5f383eea6b
BUGFIX #5855 SSViewer::get_base_tag() should produce a properly closed base tag for XHTML (thanks smorris!)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108413 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Sean Harvey
52f1d1b17d
BUGFIX Undefined variable when calling DataObject::many_many_extraFields() and relation name couldn't be found for the component
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Carlos Barberis
900d4ea23a
BUGFIX: DataObjects without the Versioned decorator cannot have a "Version" field. ticket #5775 . Thanks ajshort
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Carlos Barberis
dc8dee7dd9
BUGFIX: Added condition to avoid error creating "PastMember" cookie on dev/build (ticket #5780 ) Thanks simon_w
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:41 +13:00
Ingo Schommer
5a8f4b4605
MINOR Added warning about Director::set_dev_servers()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:40 +13:00
Sam Minnee
36bdb52823
BUGFIX: Don't have any host-based dev servers set by default.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108027 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:40 +13:00
Sam Minnee
cc1584cf12
ENHANCEMENT: Show a warning inside the the CMS if you've neglected to delete install.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:39 +13:00
Will Rossiter
797c8bf3f3
ENHANCEMENT: added getter to get array back out of an ArrayData instance. MINOR: updated docblocks in ArrayData
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108012 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:39 +13:00
Ingo Schommer
78ac0fe3d6
ENHANCEMENT Allowing custom messages and permission codes in BasicAuth::protect_entire_site()
...
ENHANCEMENT Making $permissionCode argument optional for BasicAuth::requireLogin(). If not set the logic only checks for a valid account (but no group memberships)
ENHANCEMENT Using SS_HTTPResponse_Exception instead of header()/die() in BasicAuth::requireLogin() to make it more testable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:38 +13:00
Sean Harvey
7fc3d8bd09
MINOR Reverted r107831
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:38 +13:00
Sean Harvey
cf4be93f87
BUGFIX dev/build always reporting index change because of a whitespace in the index column names
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:38 +13:00
Ingo Schommer
71a9ff089d
MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:38 +13:00
Will Rossiter
b0bb478615
MINOR: removed whitespace
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:38 +13:00
Will Rossiter
ce7cf0113c
BUGFIX: fixed inclusion of environment file when document root is the web root
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:37 +13:00
Ingo Schommer
b20f1fd59d
BUGFIX Remove dummy entry created by Versioned if record is first written to Live stage ( fixes #5596 , thanks muzdowski)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:37 +13:00
Saophalkun Ponlu
b8f27de42e
ENHANCEMENT: html2raw now properly replace strong tag with asterix #5494
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:37 +13:00
Ingo Schommer
fcd9858271
MINOR Better error handling in i18n::get_language_name()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Saophalkun Ponlu
f9ea2613e6
ENHANCEMENT: allow adding a new a field to ArrayData
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Carlos Barberis
e344eb0dcc
MINOR: Fixed Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107430 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Carlos Barberis
4833ecbfd0
ENHANCEMENT: Added documentation and changed static names
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Carlos Barberis
30b4699734
ENHANCEMENT: Added static to set regeneration of default pages (ticket #5633 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107426 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Will Rossiter
7e30018e8d
BUGFIX: Only highlight strings more than 2 characters long. #4949
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Ingo Schommer
8dee93b523
BUGFIX Allowing dev/build in "live" mode when Security::database_is_ready() returns FALSE (typically happens when an existing SilverStripe project is upgraded and database columns in Member/Permission/Group have been added) ( fixes #4957 )
...
MINOR Using Object::create() in DevelopmentAdmin to make objects mockable
ENHANCEMENT Added Security::$force_database_is_ready to mock database_is_ready() state
ENHANCEMENT Added permission check exception in TaskRunner and DatabaseAdmin if SapphireTest::is_running_test() returns TRUE (necessary for DevelopmentAdminTest)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:36 +13:00
Ingo Schommer
423a526c8d
MINOR Documentation in DataObjectSet
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Ingo Schommer
342d739504
MINOR Changed "no_NO" locale for Norwegian into the more commonly used "nb_NO" in i18n class, meaning translations from translate.silverstripe.com can actually be selected now ( fixes #5746 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Sean Harvey
a10bb202af
ENHANCEMENT Use array_combine() instead of custom logic for ArrayLib::valuekey() (thanks paradigmincarnate!)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107380 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Sean Harvey
3be26a4cec
ENHANCEMENT #5352 Decouple date display from i18n locales, users now have access to change their date and time formats in Member::getCMSFields() using Member_DatetimeOptionsetField field
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:35 +13:00
Ingo Schommer
7e65d3c5af
MINOR Documentation in File and Folder class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Will Rossiter
d5ae174e95
MINOR: updated generator tag URL
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Andreas Piening
58e7936004
MINOR: force exclusive connection
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Will Rossiter
f7f237f119
ENHANCEMENT: abstracted protocol detection out to Director::protocol() #5450
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Will Rossiter
12aedc0e30
ENHANCEMENT: in referencing a file in combine_files() it should fall back to standard requirement tags if combining has been disabled eg dev mode
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Will Rossiter
c6364e5548
BUGFIX: prevented HTTPRequest->shift() throwing notices when shifting multiple elements. APICHANGE: SS_HTTPRequest->shift($multiple) no longer returns an array of size $multiple spaced with nulls, it returns an array up to the size of $multiple.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Will Rossiter
b834248ddc
BUGFIX: fixed notice level errors getting through
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Andreas Piening
7be9ca0c7e
MINOR: return false rather than error out in case SS_Query:: is not a resource
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107030 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Andreas Piening
b5ad10bff1
MINOR: mysql_fetch_row() expects resource, this will fatal if query was e.g. UPDATE when iterating a result because MySQLQuery::nextRecord() is used by Iterator::valid() and MySQLQuery:: is bool in this case
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:33 +13:00
Ingo Schommer
422d654dae
BUGFIX Re-enabling theme in ErrorPage->doPublish() (it's usually disabled in the publication context through LeftAndMain->init())
...
MINOR Reverted r88633, it breaks <base> tag in static HTML for ErrorPage->doPublish()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:32 +13:00
Ingo Schommer
3dc526c00f
ENHANCEMENT Calling Image->deleteFormattedImages() in Image->onBeforeWrite() ( #5423 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:32 +13:00
Luke Hudson
8079bfd417
MINOR: Correct typo in comments
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:31 +13:00
Ingo Schommer
25b65b71cf
BUGFIX Checking for the same combined filename in Requirements::combine_files() to avoid irrelevant error messages
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:31 +13:00
Will Rossiter
41ec792cb4
ENHANCEMENT: added prefix and suffix support to ContextSummary
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:31 +13:00
Will Rossiter
b7d073d910
BUGFIX: if running in cli do not output html tags when rebuilding the db
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Sam Minnee
493fb1be55
BUGFIX: Replaced Versioned's unique index definition with an array syntax.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Sam Minnee
afdf8afaf4
BUGFIX: Fixed SiteTree::IsModifiedOnStage() for an edge-case that was identified when deleteFromStage() stopped manipulating the current record.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Sam Minnee
5fbc19f5be
BUGFIX: Don't let deleteFromStage() kill the ID of the original record.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Sam Minnee
3f6005fd6a
BUGFIX: Add a unique index to SiteTree_versions.RecordID+Version. Fix saving methods to support this.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Sam Minnee
e1753a35e5
BUGFIX: Throw an exception if you try an delete an unsaved or already-deleted record
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@106078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:30 +13:00
Carlos Barberis
20fe6e8f6f
BUGFIX: reverted revision 105890 to fix build
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:29 +13:00
Carlos Barberis
3bbcb31364
ENHANCEMENT: Added method for $this->request->latestParam() backwards compatibility with Director::urlParam()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:29 +13:00
Will Rossiter
eecac2f069
APICHANGE: refactored methods in session to use coding conventions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:29 +13:00
Ingo Schommer
003d43f3ac
BUGFIX Moved SiteTree->ParentID property to Hierarchy extension ( fixes #5638 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:28 +13:00
Ingo Schommer
93f05f8acb
BUGFIX More specific regex in Requirements->includeInHTML() to avoid duplicating information by matching HTML5-style <header> tags instead of <head> ( fixes #5640 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:28 +13:00
Ingo Schommer
0742a38732
MINOR Using ASSETS_DIR and THEMES_DIR constant in Image, ManifestBuilder, Requirements, File ( fixes #5619 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:27 +13:00
Ingo Schommer
24b365d4e2
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)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:27 +13:00
Ingo Schommer
3aabb05d90
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:26 +13:00
Will Rossiter
9d36286291
MINOR: increased height of the todo text field in the cms
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105139 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:26 +13:00
Ingo Schommer
2927d55ccd
MINOT Translation in SiteTree ( #5603 , thanks Pike)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:26 +13:00
Ingo Schommer
a6c968b3f3
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 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105027 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:26 +13:00
Ingo Schommer
0960bdd76a
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105011 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:26 +13:00
Ingo Schommer
cc592f98c2
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
9b11232961
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
a6d019bd76
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104996 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
a0d4b58908
BUGFIX Fixed i18nTextCollector when used with i18nEntityProvider - class manifest is now stored lowercase, which means i18n::get_owner_module() didnt work reliably
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
a809289a25
MINOR Removed duplicated code in i18nTextCollector, more defensive checks for get_owner_module()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
416c8fcc2a
MINOR Allowing translation of "save" button in SiteConfig->getCMSActions()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104978 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Will Rossiter
a9b238885c
ENHANCEMENT: added Month function for consistency
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104935 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:25 +13:00
Ingo Schommer
d7cb0fc39d
MINOR Fixed hidden mbstring reliance in SiteTree->generateURLSegment() (broken in r104679)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Mark Stephens
2eb9884ec9
BUGFIX: catch case of plugin not returning translations for the locale
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Mark Stephens
8e1f2b645c
ENHANCEMENT: added plugins to i18n to support modules that provide custom translations.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Ingo Schommer
eb178cc75e
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Ingo Schommer
36eb2c91ff
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Ingo Schommer
4246cad180
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104767 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Andreas Piening
fffb0b91a4
MINOR: fixed umlauts
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:24 +13:00
Sam Minnee
656191c70b
MINOR: fixed api doc
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104682 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:23 +13:00
Sam Minnee
76dfdd85ea
BUGFIX: Make URLs lowercase
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104679 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:23 +13:00
Sam Minnee
cff1cf10d3
BUGFIX: Fixed Translatable::canEdit() to suit new permission customisation scheme
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:23 +13:00
Sam Minnee
9e56293931
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.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:22 +13:00
Sam Minnee
22e310dacd
BUGFIX: Director::test() shouldn't break if $_SESSION isn't set.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:22 +13:00
Sam Minnee
8424f9c496
API CHANGE: Moved site tree permission extension to a 3-state system (true, false, null, where null means "no effect")
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:22 +13:00
Sam Minnee
bb5a333837
BUGFIX: Generate stage/live links using Controller::join_links() instead of string concatenation.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:21 +13:00
Sam Minnee
d8b6b59ebd
BUGFIX: Fixed Controller::join_links() handling of fragment identifiers
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104580 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:21 +13:00
Ingo Schommer
32dfef3a2f
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:21 +13:00
Sam Minnee
4fd6d3ad39
BUGFIX: When finding an old page in the 404 handler, favour existing subpages over historical ones.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:21 +13:00
Sam Minnee
2bc1af1752
BUGFIX: Fix legacy URL redirection for pre-nestedurls URLs, after it has been enabled.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104463 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:21 +13:00
Ingo Schommer
9f2a6ed501
MINOR Migrated various API-style documentation from doc.ss.org
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:20 +13:00
Ingo Schommer
d7134392d7
MINOR Documentation for DB::manipulate() (moved from http://doc.silverstripe.org/manipulation-arrays )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104121 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:20 +13:00
Luke Hudson
281e22b71e
FEATURE: Add dev/build/defaults to call requireDefaultRecords
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:20 +13:00
Luke Hudson
2e6451f99b
MINOR: Recognize and allow HTTP/422 response code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:19 +13:00
Ingo Schommer
2210783c68
BUGFIX ViewableData->castingClass() cuts off last character of a casting definition if it has bracketed arguments ( fixes #5536 , thanks ajshort)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:19 +13:00
Ingo Schommer
f3e01c98b7
BUGFIX Fixed Database->requireTable() for Mysql 4.1 ( fixes #5517 , thanks gw0)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:19 +13:00
Will Rossiter
655faf0c39
APICHANGE: changed the modulus offset to 1 to correctly order sets
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:17 +13:00
Sam Minnee
29d4e5258f
MINOR: Restored docblock of SQLQuery::unlimitedRowCount()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103692 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:17 +13:00
Sam Minnee
e86cf93f35
BUGFIX: Fixed ordering by aggregate columns for DataObject::get() calls with joins.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Sam Minnee
6f9aa32ccc
BUGFIX: Fixed unlimitedRowCount() for grouped queries
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Sam Minnee
1df4ba601e
BUGFIX: Ensure that group by of many-many queries with extraFields is set correctly.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Andreas Piening
907f6f7ead
MINOR: recache tables if cache is empty
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Sam Minnee
6a72c21f0e
BUGFIX #5362 : Fixed duplicate removal on DataObject:get() with join argument for all databases.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Ingo Schommer
c8a338dcab
ENHANCEMENT Added i18n::set_default_locale() to set standard locale (which is different from "current locale" retrieved through i18n::get_locale())
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:16 +13:00
Ingo Schommer
c8163eb609
BUGFIX Renamed Nested URLs are automatically redirected to their new location with 301 HTTP status code in ModelAsController/ContentController ( fixes #5393 , thanks cbarberis)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Ingo Schommer
219c5ff893
BUGFIX Allow EDIT_SITECONFIG permission selection in admin/security ( fixes #5459 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Ingo Schommer
1f1dda8643
MINOR Fixed phpdoc documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Ingo Schommer
df671a35f3
MINOR Fixed phpdoc documentation (from r103390)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Ingo Schommer
6f0df9eb19
MINOR Fixed phpdoc documentation (from r103385)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:15 +13:00
Sam Minnee
7b4261ed38
BUGFIX: Don't show error when adding default SiteConfig records after upgrading a site.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:14 +13:00
Ingo Schommer
2107985272
MINOR Enum DBField class should default to ExactMatchFilter to avoid wrong results with overlapping Enum values in LIKE queries (see #5434 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103322 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:14 +13:00
Geoff Munn
2518421b64
BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:14 +13:00
Hamish Friedlander
f7c3c35a13
BUGFIX: r101093 broke casting of values from the failover object. Add lookup to the failover for casting info, and add test
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:14 +13:00
Mateusz Uzdowski
b6ab3b4ed0
ENHANCEMENT: allow onAfterPublish and onBeforePublish handlers directly on Page classes ( #5112 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Geoff Munn
d21e7b0623
BUGFIX: default sort column now quoted
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Ingo Schommer
6410432a3a
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
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Mateusz Uzdowski
f410107b40
MINOR: fixed the error message on class conflict ( #5439 , patch submitted by rorschach)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Mateusz Uzdowski
2889e57590
BUGFIX: disallow numeric actions - numeric array indexes are incorrectly picked up as allowed actions ( #5331 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Mateusz Uzdowski
9ac7da146b
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)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:13 +13:00
Carlos Barberis
7037afc879
BUGFIX: added optional separator for http_build_query in HTTP:setGetVar(). this fixes sorting columns in ModelAdmin (ticket #5325 ).
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@103012 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Ingo Schommer
0b44d49167
MINOR Using canView() instead of deprecated can('view') in ContentController
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Carlos Barberis
f413c30d91
ENHANCEMENT: added language (Ticket #5390 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Ingo Schommer
a948824c43
BUGFIX Fixing RquestHandler->checkAccessAction() on PHP 5.2 - ReflectionMethod->class returns inconsisent results in older PHP versions. (see r102003)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102730 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Sean Harvey
f6731e3efb
BUGFIX Float should always be not null and default 0 in the database
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Ingo Schommer
3588f6cf16
BUGFIX Using i18n::get_locale() in ContentController->ContentLocale() to ensure the correct locale can be used in templates withouth Translatable enabled (broken in r97207, thanks DesignCity) (from r102544)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Ingo Schommer
551d8d9af3
MINOR Fixed undefined variable in SiteTree::can_edit_multiple() (broken in r83442) (from r102516)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Sean Harvey
53f2f7a873
BUGFIX #5316 Float and Double should never try to save NULL as the "null" value
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Will Rossiter
49ddb8d247
BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Mark Stephens
4568ac057d
BUGFIX: SSViewer now allows cli to do a flush on non-dev environments
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:12 +13:00
Sam Minnee
6cf35458bd
BUGFIX: Fixed bug with SiteTree::onBeforeWrite() that broke subsites.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Sam Minnee
04fe15cc7c
BUGFIX #5343 : Call DataObject::onBeforeWrite only once for SiteTree
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Sam Minnee
20a61098c6
BUGFIX #5337 : Allow decoration of DataObject
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Andreas Piening
6db693a09e
MINOR: added abstract datetime helper functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Ingo Schommer
4c71c667e3
BUGFIX Fixed SiteTree::page_type_classes() to exclude 'SiteTree' even if on array position 0 - slight difference in return values from Postgres to MySQL ( fixes #5336 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102074 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Ingo Schommer
f6a8976121
BUGFIX Fixed SiteTree::page_type_classes() removal of base class (was broken if database driver returned classes in arbitrary order, e.g. in Postgres)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102026 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:10 +13:00
Ingo Schommer
09353a2b6c
MINOR Fixed indentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:10 +13:00
Ingo Schommer
c85b71623a
BUGFIX Prevent handling of controller actions which return $this avoid infinite loops in RequestHandler->handleRequest (thanks Hamish!)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102004 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:10 +13:00
Ingo Schommer
4c74f45361
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.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:10 +13:00
Ingo Schommer
9ae7fe67a5
BUGFIX Checking for existing redirections in FormResponse::respond ( fixes #5208 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:10 +13:00
Sam Minnee
a4b4bd7fcd
BUGFIX: Ensure that DataObject IDs are numbers and no string equivalents of numbers - 3 not '3'
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Tom Rix
ccd46b0bcc
MINOR take advantage of an alternate path for error pages
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Sam Minnee
6892f1d196
BUGFIX #4188 simon_w: Let require tags in templates be conditional
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Sam Minnee
4864553aca
BUGFIX: Recover if a manifestClassParse file doesn't have the necessary content.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Hamish Friedlander
04299df886
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
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:09 +13:00
Will Rossiter
9bb41119e7
BUGFIX: preserve the port value if given in HTTP::setGetVar ( #5280 ). BUGFIX: allow username only input rather than user:pass combo.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Geoff Munn
deaa1d675e
BUGFIX: disable function re-enabled
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
ec642f1fad
MINOR Marked DataObject::has_own_table() as static
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
0e4a042ece
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 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
d41539ad22
BUGFIX Versioned->publish() with $createNewVersion=TRUE now increases version number of in-memory object ( fixes #5261 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101739 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Sean Harvey
e36c38dbc1
BUGFIX #5277 Sort of default SiteTree records is now explicitly set to avoid strange ordering set by SiteTree::onBeforeWrite for default records
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:08 +13:00
Ingo Schommer
227dd2375c
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 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
a894e5c1fe
MINOR Reverted r101670 as it broke assumptions made in RedirectorPageTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
b8520cc20c
ENHANCEMENT RedirectorPage ExternalURL field now defaults to http:// to be consistent with the "Another website" option for HtmlEditorField LinkForm
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:07 +13:00
Sean Harvey
0e77cfbb09
BUGFIX #5259 RedirectorPage and HtmlEditorField TinyMCE integration now prefixes http:// if no prefix is found
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
935db2a9c5
BUGFIX #5245 Sometimes page records will have a NULL ParentID value, it should be a number even if it's 0 (thanks wrossiter!)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101657 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sean Harvey
20f0da7c05
BUGFIX #5243 Undefined Convert functions in ViewableData replaced with working versions. Thanks benediktb!
...
MINOR Updated ViewableDataTest to verify ViewableData changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Geoff Munn
fcfd9e15a1
BUGFIX: test that the class exists before running subclass tests
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Mateusz Uzdowski
89c7430600
BUGFIX: put back into the SSNavigator the archived site link ( #5251 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Mateusz Uzdowski
4bd3712206
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 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Will Rossiter
28c0d8171b
MINOR: fixed notice level error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101600 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:06 +13:00
Sam Minnee
5dfadd0e9c
BUGFIX: HTTP::setGetVar() returns a relative URL if a relative URL is passed, to make behaviour closer to 2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Sean Harvey
4a516d8eed
MINOR Removed rewritest.php places in sapphire since it's no longer part of the phpinstaller/branches/2.4 package
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101353 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:05 +13:00
Ingo Schommer
3e8b155557
BUGFIX Fixed SiteTree->Content link shortcode parsing introduced in r101093 ( #5227 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:04 +13:00
Ingo Schommer
1a30c9f8ff
BUGFIX Checking for existence of "ShowInMenus" property in Folder->liveChildren() and stageChildren() ( #5190 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:04 +13:00
Ingo Schommer
a3812e28a5
MINOR Fixed missing closing <div> in ContentController->successfullyinstalled()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101254 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:04 +13:00
Ingo Schommer
7028a42658
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.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:04 +13:00
Sam Minnee
f9836b0f01
BUGFIX: Pass correct class to allowPrimaryKeyEditing in yaml fixture
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:03 +13:00
Sam Minnee
52538032a8
BUGFIX: Don't recreate a missing draft page when calling SiteTree::doUnpublish()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:03 +13:00
Sam Minnee
5ab421e946
BUGFIX: Fixed versioning of pages
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:03 +13:00
Sam Minnee
d825a6bb5c
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()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:03 +13:00
Sean Harvey
682e7d0f1a
BUGFIX #5214 ViewableData::obj() was creating a DBField without a fieldname argument and caused problems, one example is the version panel of the CMS
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sam Minnee
f2bb6baa9f
BUGFIX: Ensure that Versioned works on classes with underscores in the names. (from r100905)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sam Minnee
f3a666b89f
BUGFIX: Fixed issues with broekn link tracking
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Hamish Friedlander
267de8887a
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.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Ingo Schommer
b37fede7d1
MINOR Localized "dependent pages" features in SiteTree->getCMSFields()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sam Minnee
7c920762ae
BUGFIX: Allow classes to be referred to with casing that differs from their definition.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sam Minnee
3aad86d9be
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
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:02 +13:00
Sam Minnee
34d53dc42d
BUGFIX: Flush cache after deleting an item.
...
BUGFIX: Fixed databaseFieldsOnly version of DataObject::getChangedFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sam Minnee
25836a1bea
BUGFIX: Fixed bugs with copying custom fields into Virtual pages, generally made virtual pages more robust and performant.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sam Minnee
48d3f48edb
BUGFIX: Fixed link rewriting to work on other HTMLText fields (from r99517)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sam Minnee
021d339372
BUGFIX: Return true if SiteTree:doUnpublish() succeeds. (from r99515)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sam Minnee
5a68d0f3b5
BUGFIX: Update Object::parse_class_spec() to handle arrays.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Geoff Munn
9395633251
BUGFIX: call_user_func_array changed to PHP 5.1 compatible notation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sam Minnee
43b0ee21c6
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)'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:01 +13:00
Sean Harvey
470082d12d
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)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:00 +13:00
Sam Minnee
5fc298cf1e
API CHANGE: Made MySQL fulltext search optional, activated with MySQLFulltextSearchable::enable()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:00 +13:00
Sam Minnee
2a22e73615
API CHANGE: Pass the full extension string as the 2nd argument to DataObjectDecorator::extraStatics()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:59 +13:00
Sean Harvey
e9d9c7d84c
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)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:59 +13:00
Sean Harvey
66ede9ce14
MINOR Removed unused variable in SiteTree::MetaTags()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:59 +13:00
Sam Minnee
3f3c2b2fe9
BUGFIX: Fixed file-write testing issues in requirements combined file generation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100982 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:58 +13:00
Sam Minnee
f057d60adc
BUGFIX: Remove cache for Hierarchy::AllChildren() and Hierarchy::AllChildrenIncludingDeleted(), since they increase memory usage unnecessarily.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:58 +13:00
Sam Minnee
46586185f6
BUGFIX: Don't make CMS loading slow if the combined javascript files can't be written.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100979 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:58 +13:00
Ingo Schommer
dd649257fe
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
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:58 +13:00
Ingo Schommer
c79a9d5a03
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 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100937 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Sean Harvey
a93107f4d4
BUGFIX SiteTree::getSiteConfig() should always fall back to using a default if an alternate config wasn't found
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Sean Harvey
ad338ddeb7
MINOR Fixed phpDoc argument in ViewableData::hasValue()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Sean Harvey
d4e565708c
BUGFIX DataObject::hasValue() is now compatible with parent ViewableData::hasValue() (this also fixes E_STRICT standards in PHP)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100921 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Sean Harvey
2a583d9320
BUGFIX RequestHandler::handleRequest is now compatible with Controller::handleRequest in that SS_HTTPRequest is the type hint for the $request parameter
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Sean Harvey
6a6bb881a4
BUGFIX ManifestBuilder::up_children() should be declared as static as it's called statically
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:57 +13:00
Ingo Schommer
0f324c852e
BUGFIX Produce XHTML compliant URLs in HTTP::setGetVar() by default (regression from r98373, see #5101 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100904 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:56 +13:00
Sam Minnee
65a2ee710a
BUGFIX #5138 : DataObjectSet::removeDuplicates() removes objects of different classes with the same ID
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:56 +13:00
Ingo Schommer
2cbbcfe3ab
MINOR SilverStripeNavigator.js used jquery.live instead of livequery, and doesn't include unnecessary behaviour.js
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:55 +13:00
Sean Harvey
6cf5a055e6
BUGFIX Use "wb" argument in ManifestBuilder fopen() calls for better cross-platform compatibility
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:55 +13:00
Sean Harvey
12d1ea9edb
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
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:55 +13:00
Ingo Schommer
7e7cdab53e
MINOR Improved help texts around permissions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:52 +13:00
Tom Rix
5ff0c2c781
MINOR dont copy embargo or expiry to virtual page
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:52 +13:00
Tom Rix
27f20c5948
ENHANCEMENT you can now choose your site locale at install time
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:52 +13:00
Mateusz Uzdowski
67c9412225
BUGFIX: Date::now() supplies wrong string - it misses leading zeroes on hours
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100767 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:52 +13:00
Mateusz Uzdowski
2a6f36e4f9
BUGFIX: added uniqueness id, to prevet multiple VirtuaLage reloads on publish
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:52 +13:00
Geoff Munn
9ebabb1785
BUG FIX: column names quoted properly
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Geoff Munn
bcc6590799
BUG FIX: column names quoted properly
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Geoff Munn
535698a997
BUG FIX: the default value for decimals are now cast as (doubles)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Sam Minnee
507da370ff
MINOR: Director::currentPage() is deprecated but shouldn't throw a notice-level error until the next major release.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Geoff Munn
4289a338e6
API CHANGE: dbDataType function created
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Ingo Schommer
3533c1f287
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 ) (from r100631)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:50 +13:00
Sean Harvey
f6f909ae87
BUGFIX DB::getConnect() should be properly declared as a static function
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
e9aca56fad
MINOR Cookie - removed unncessary extending of Object since this class only has a bunch of static functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
757c28f7ae
MINOR Convert - removed unncessary extending of Object since this class only has a bunch of static functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
adc4ffe772
MINOR ArrayLib - removed unncessary extending of Object since this class only has a bunch of static functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
63e8a02c92
MINOR Removed double slashes from path in Requirements_Backend::process_combined_files()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
5d47b22c44
BUGFIX Fixed filemtime() check in Requirements_Backend::process_combined_files() not getting the right path
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
e078013547
MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
59b4ab4550
BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
dd64c562cb
ENHANCEMENT Stored combined files in assets/_combinedfiles by default
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
84a7755e4e
MINOR Removed Requirements:: static call and replace with instance
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
975e3b5a82
ENHANCEMENT #3387 Requirements now has a new static function called Requirements::set_combined_files_folder() for setting where the combined files should belong
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
ddf0f35d27
MINOR Removed end php tag for Requirements and RequirementsTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Sean Harvey
450c3cb408
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
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Tom Rix
d5dba5f3fc
MINOR can always create top level if admin
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Sean Harvey
8d5faeb10d
API CHANGE Removed deprecated Image::loadUploaded() (deprecated from the parent::loadUploaded for which it called), please use Upload directly instead!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Sean Harvey
00e3677ce8
API CHANGE Removed deprecated function RootURLController::get_homepage_urlsegment(), please use RootURLController::get_homepage_link() instead!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
a9241e3fc4
API CHANGE Removed deprecated function SiteTree::get_by_url(), please use SiteTree::get_by_link() instead!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
9f45951a43
MINOR Fixed tabbing in DataObjectSet
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
3d41240478
API CHANGE Removed deprecated methods DataObjectSet::filter_map() and DataObjectSet::map_multiple() - please use map() instead!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
d91fa6fdfd
MINOR Changed places of Object::extInstance() to Object::getExtensionInstance() and added a notice if extInstance is used in future
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
a8bd797f69
MINOR Changed @deprecated note for Director::redirectBack to 2.5 as it's still widely used
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
4eb50972c3
MINOR Fixed regression of Convert::json2obj() not working when json_decode() is being used
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
20cbc51554
ENHANCEMENT #4599 DataObjectSet now uses more array functions instead of performing equivalent tasks - thanks simon_w!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:46 +13:00
Sean Harvey
4a37a2d24e
MINOR phpDoc bits for Convert Services_JSON functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:45 +13:00
Sean Harvey
4e2272334a
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
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:45 +13:00
Luke Hudson
51de5dc914
BUGFIX: Fix mismatch with $all_locales and $common_locales ( #5096 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100406 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:45 +13:00
Sean Harvey
7937f5d7cc
BUGFIX YamlFixture::writeDataObject() - some databases need special allowance to edit the primary key column - do so by using DB::getConn()->allowPrimaryKeyEditing()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:45 +13:00
Geoff Munn
bd74d6dd76
BUGFIX: PHP 5.1 requires an array rather than a string for call_user_func()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:44 +13:00
Luke Hudson
6b82cc8ab0
BUGFIX: Show Language dropdown in English ( #5098 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100359 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:44 +13:00
Tom Rix
1ad8186d94
MINOR correct order of OBW
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:44 +13:00
Tom Rix
c864a99b95
BUGFIX SQL Error is a member is not part of any groups
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:44 +13:00
Tom Rix
f1cd60cbf9
MINOR added Rfc2822 method to SS_Datetime. Fixed bug where dates in DataObject would not set times.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Tom Rix
2fb156a660
MINOR LastEdited/Created dates are now mockable via SS_Datetime
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Luke Hudson
be26cf2579
BUGFIX: Fix #5097 , Translatable uses augmentValidURLSegment to check that URLSegment is valid
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Luke Hudson
5531e01a69
API CHANGE: SiteTree::validURLSegment extendable ( #5907 )
...
Uses $this->extend('augmentValidURLSegment')
so that (for instance) Translatable can hook this.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Luke Hudson
3ec85156d1
Revert "FEATURE: Use tidied HTML in DataDifferencer"
...
This reverts commit a0d2f7b3e289d12dedcdbd02ae52eec3e6718340.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:42 +13:00
Sean Harvey
6289961c07
MINOR Reverted r99522 as this will cause problems if File records are deleted when the resampled images are linked to in the content fields
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:42 +13:00
Sam Minnee
b7ff50ac46
BUGFIX #4974 : Improve accuracy of ManifestBuilder::parse_file() cache, to remove a source of upgrade bugs.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:41 +13:00
Ingo Schommer
578aa21de9
ENHANCEMENT Allow DataObjectSet to remove duplicates based on any field ( #5094 , thanks mobiusnz) (from r99736)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:41 +13:00
Luke Hudson
d6b219957a
BUFGFIX: Prevent selection of self as parent (see #5106 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:41 +13:00
Ingo Schommer
e4463092cb
BUGFIX Fixed DataObject->fieldLabels() to respect flag (from r98748)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00
Sam Minnee
3643205d8e
BUGFIX: Fixed Access tab on SiteConfig
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99595 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00
Sam Minnee
9f0a133d5a
BUGFIX: Show 'Inherit' option for edit and view all the time (since we now have SiteConfig)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00
Sean Harvey
9960c65a5a
BUGFIX Image::onBeforeDelete() now calls deleteFormattedImages() so resampled images in the filesystem are cleaned up
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00
Geoff Munn
74b523f117
BUGFIX: tablename and columns quoted properly
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:38 +13:00
Mark Stephens
2595798833
BUGFIX: batch_permission_check returns null rather than empty array when user has no permissions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:38 +13:00
Ingo Schommer
c945e23c62
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 $timeformat 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 $futureOnly 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.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:38 +13:00
Ingo Schommer
ea665cd45e
BUGFIX: Disable some permission caching for now, as it was breaking unit tests (from r98504)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99303 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
833db1b5a6
BUGFIX: SiteTree::batch_permission_check() doesn't recurse with ID=0 calls
...
ENHANCEMENT: SiteTree::batch_permission_check() populates its own cache (from r97900)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
7e4586d744
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
61d880ce68
MINOR Added Requirements for SilverStripeNavigator (see r99080)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:37 +13:00
Ingo Schommer
1014bb6ef5
BUGFIX: Only show live link when page has been published (from r97839)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
872d86e7f4
BUGFIX: Make sure draft/published links go to the right subsite (from r97747)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
7f4a515649
BUGFIX: Fix navigator links not opening in new windows. (from r97510)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
daba461c48
MINOR Partially reverted r99079 - SiteTree->getNavigatorItems() was refactored to SilverStripeNavigator::get_for_record()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
2805cfabdb
FEATURE: Add Link to silverstripe navigator (from r97407)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
ed8e75ea8d
APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:36 +13:00
Ingo Schommer
6977178c14
MINOR adjustments to ensure that the cached permissions were actually hit (from r98835)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99068 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
530b943dae
BUGFIX: Ensure that ModelAsController::init() can trigger redirections. (from r98702)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
f5424da34a
BUGFIX: Fixed SiteTree_versions version numbers for published virtual pages. (from r98675)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
474b0b9f7a
MINOR refactored setting/getting strict hierarchy setting. (from r98654)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
f7e872a1c2
API CHANGE: Let sitetree extensions prepopulate permisson cache for their own permissions. (from r98650)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
59b7d14720
MINOR more unit tests around loose hierarchy (from r98509)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
861466f8f8
MINOR added enforce_strict_hierarchy option, and tests around not cascading deletions (from r98498)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
0eeb764f3c
MINOR reload the virtual page if you are looking at the current one on save. To prevent overwriting fields (from r98496)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
b05117bd68
BUGFIX: Generate SiteTree_version records for VirtualPages more reliably. (from r98309)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:35 +13:00
Ingo Schommer
d1bdb6e9d4
BUGFIX: fix incorrect link in CMS (from r97408)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99050 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:34 +13:00
Ingo Schommer
4e58e1996a
BUGFIX: Make sure CMS link knows when its currently in the CMS (from r97403)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:34 +13:00
Ingo Schommer
76b366e760
FEATURE: Make navigator items more overloadable (from r97376)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:34 +13:00
Ingo Schommer
1f60bde524
FEATURE: Refactor links in $SilverStripeNavigator so modules can add extras (from r97299)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:34 +13:00
Tom Rix
d2f05399e0
MINOR fix typo
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:33 +13:00
Tom Rix
9b7d030eda
BUGFIX fix for #5076
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sean Harvey
8a0a0b3263
MINOR Added brackets around strpos() check just to be sure it works
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sean Harvey
628cca92ba
BUGFIX Fixed strpos() check in BASE_URL check
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Sean Harvey
3a0a508911
BUGFIX Installer now opens if mod_rewrite is disabled. Using index.php instead of rewriting the URL didn't quite work with the new BASE_URL, so we need to take this case into account as well
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:32 +13:00
Julian Seidenberg
d5fe2733e0
BUGFIX: modified float to have the same database table schema as int. Now defaults to zero and 'not null'
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:31 +13:00
Sean Harvey
d5683eda56
BUGFIX Fixed quoting on ContentController::successfullyinstaller() - this broke certain databases like PostgreSQL
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:31 +13:00
Sean Harvey
79010479da
BUGFIX #5053 Aggregate::query() should not set an orderby clause, otherwise databases will complain
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:30 +13:00
Geoff Munn
e0f9137afc
BUGFIX: columns quoted properly
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:30 +13:00
Sam Minnee
56f05c7a08
BUGFIX: Fixed ManifestBuilder::has_been_included()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:30 +13:00
Ingo Schommer
0532bd92ae
BUGFIX Fixed ManifestBuilder::get_themes() not to assume an existing themes/ folder
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:29 +13:00
Andrew O'Neil
bd57194417
BUGFIX: Fix virtual pages not returning correct content
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:28 +13:00
Sam Minnee
a7318bf846
BUGFIX: Fixed infinite loop in FILE_TO_URL_MAPPING lookup when calling arbitrary scripts via CLI
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:28 +13:00
Ingo Schommer
5ae6f3b9e4
MINOR Partially reverted r98382 which added unnecessarily defensive checking to Hierarchy->allChildren()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Ingo Schommer
badd45a663
BUGFIX Fixed Hierarchy->loadDescendantIdList() to call setOwner() on the extension instance. This was necessary due to underlying Object/Extension changes in 2.4.
...
MINOR Fixed HierarchyTest assertions around including grand children counts
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Sean Harvey
9cf6bd8c7c
BUGFIX #5044 Hierarchy::loadDescendantIDListInto() now uses Object::getExtensionInstance('Hierarchy') instead of going through __call(), as PHP 5.3 has issues converting references to values
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:27 +13:00
Ingo Schommer
792b4cc1c4
API CHANGE HTTP::setGetVar() always returns absolute URLs. Use Director::makeRelative() to make them relative again.
...
API CHANGE HTTP::setGetVar() combines any GET parameters in PHP array notation (e.g. "foo[bar]=val") instead of replacing the whole array
BUGFIX HTTP::setGetVar() uses parse_url() and http_build_query() to add query parameters to an existing URL, instead of doing its own regex-based parsing. This means existing GET parameters are correctly url encoded.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98373 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:26 +13:00
Ingo Schommer
ff724b44de
MINOR Documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98372 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:26 +13:00
Ingo Schommer
6a1b88aaf1
BUGFIX Fixed ContentController->deleteinstallfiles (added to $allowed_actions, see #5040 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98324 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:26 +13:00
Ingo Schommer
13c8b89310
MINOR Removed message alteration from ValidationResult->error() to make it more predictable for string matching in unit tests like SecurityTest
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98275 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:25 +13:00
Andrew O'Neil
508316a19c
BUGFIX: Don't force SSL when running from CLI
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:25 +13:00
Sam Minnee
60f93644a0
BUGFIX: Updated SiteConfig-based theme selection to remove inappropriate coupling from SSViewer
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98263 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:25 +13:00
Sam Minnee
e26333e3c9
APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
684a58e3ca
MINOR make showing virtual pages tab conditional
...
MINOR made virtual page tracking sitetree tablelistfield subsite agnostic (from r98005)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
fd2b0bf5ce
MINOR removed redundant method call (from r97817)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
5efb72ce26
BUGFIX: Let ModelAsController::init() extensions trigger redirections. (from r97767)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
ba02e1dc9f
ENHANCEMENT roll batch permissions in to a generic function (from r97748)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Ingo Schommer
3f8ae83dad
BUGFIX Don't allow translations of VirtualPage (until we can reliably copy data between locales) (see #5000 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
4fbc5572d6
MINOR: fixed typos in the comments
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
f3a2cbf59f
MINOR: added quotes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Andreas Piening
1539b8d5e3
MINOR: use DB doubles only in MySQL, fall back to float
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
bac3e43ff4
MINOR better error reporting for broken redirector & virtual pages (from r97185)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:24 +13:00
Sam Minnee
366e7a7fcc
MINOR if the $fieldname to DOS->sort has a direction in it, split it out, and pass it. (from r96482)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Sam Minnee
f212585325
MINOR redirector link tracking is more intelligent (from r96461)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98139 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Sam Minnee
728e51dd8a
MINOR remove sort direction when running canSortBy. Also added test coverage for this. (from r96428)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:23 +13:00
Sam Minnee
18e933f5a1
BUGFIX: Don't make ManifestBuilder choke on empty files. (from r96058)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98133 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:22 +13:00
Mateusz Uzdowski
18b36a60ca
BUGFIX: removing search&replace victim, using unpopulated cache. Reverted to AllChildren, which calls the cache itself.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:22 +13:00
Sean Harvey
caff92709f
ENHANCEMENT Allow user theme selection through SiteConfig, falling back to SSViewer::set_theme() as a default if there are none selected
...
MINOR Unit tests for SSViewer::current_theme() and SiteConfig::getAvailableThemes()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:22 +13:00
Sam Minnee
d64a9c28ca
FEATURE: Add a function to give link to Live site (from r95948)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
0aaca03407
MINOR don't HTML-format queries from showqueries if this is an AJAX request. (from r95855)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
a03e43c8b2
API CHANGE: Refactored test for whether a SQLQuery can be sorted by a particular column into SQLQuery::canSortBy($fieldName) (from r95850)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
ce4067608c
BUGFIX: Make TableListField rely on SQLQuery for its count-generation.
...
BUGFIX: Make SQLQuery return an appropriate count if a HAVING clause is used. (from r95814)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:21 +13:00
Sam Minnee
afe433c9ab
Add some nice date formats (from r95772)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sean Harvey
0137ef0f84
ENHANCEMENT ManifestBuilder::get_manifest_info() now uses ManifestBuilder::get_themes() instead of doing it's own retrieval of available themes
...
MINOR Added ManifestBuilderTest::testThemeRetrieval() to test ManifestBuilder::get_themes()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sam Minnee
068677ab03
MINOR: Edit-case checking of data in ViewableData::$failover for better error message. (from r95560)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sam Minnee
fc44869850
MINOR added direct links to items in the backlinks report (from r88277)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:20 +13:00
Sean Harvey
e962c33903
MINOR Changed MySQLDatabase::now() block comment to be more useful
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Sean Harvey
2116c46d11
API CHANGE Decimal now allows setting a default value properly
...
MINOR Unit tests for Decimal field type default value through new test class DecimalTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Sean Harvey
61e06bc57e
MINOR Allow creating fixture records without any columns by checking the fields exist first before doing a foreach() in YamlFixture::writeDataObject()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
ef459b2c9c
MINOR: niced the way MultiEnums call requireField to give alternative adapter access
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98043 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
bcd9e763ec
MINOR: use ENUM hack for dealing with SET legacy values
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98042 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
9b3fe76269
FEATURE: added support for MySQL data type SET used in MultiEnum FEATURE: added datetime helper functions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98041 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Normann Lou
8afcd186f0
APICHANGE: rename the class "Cache" to "SS_Cache" (ref ticket: #4997 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97996 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:19 +13:00
Andreas Piening
15e98877f5
MINOR: groupby works for SQLite too
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Sam Minnee
2294d0986b
BUGFIX #5009 : Removed inappropriate field-detection change on multienums with no default
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Sam Minnee
11368564a3
MINOR: Better error message on bad Enum default
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97979 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Normann Lou
7c84d2f60b
BUGFIX: remove the possibility that Director::isDev() could be recursively called when putting isDev=1 in $_GET, addressed in ticket #4978 ( http://open.silverstripe.org/ticket/4978 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97926 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
662ee20141
BUGFIX Allowing translations of VirtualPage by not copying over original Locale property (see #5000 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
810b2162da
BUGFIX If a Group doesn't have any specific TRANSLATE_<locale> edit rights, but has general CMS access (CMS_ACCESS_CMSMain, CMS_ACCESS_LeftAndMain, ADMIN), then assign TRANSLATE_ALL permissions as a default. Necessary to avoid locking out CMS editors from their default language (see #4940 and 4941)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:18 +13:00
Ingo Schommer
81e409dcae
MINOR Removed debug code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97910 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Carlos Barberis
b1c407e53e
ENHANCEMENT: 2.4 tickets ( #4670 ) new permission code to view draft w/o CMS access
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Carlos Barberis
263e9acf61
ENHANCEMENT: 2.4 tickets ( #4670 ), new permission code to view draft stage w/o CMS access
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Ingo Schommer
bf35a7bc48
BUGFIX Checking that URL controller in HTTPRequest->match() is a subclass of Controller, not RequestHandler (which would include nested controllers like Form or FormField subclasses that shouldn't be accessible on their own toplevel URL namespace)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Tom Rix
c982bbc5df
MINOR fix call to undefined method when a virtual page picks up the wrong object.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Ingo Schommer
a6a1b619fc
MINOR PHP notice error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Sam Minnee
17a5887a80
API CHANGE: Added cancelSchemaUpdate() and doesSchemaNeedUpdating() to the Database class
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:17 +13:00
Ingo Schommer
5170f33915
API CHANGE Fixed i18n _t() calls without namespaces in template includes: They now default to setting the include filename as namespace, rather than the including template ( #4915 , #3400 - thanks Henk_Poley, jwalsoe, walec51)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:16 +13:00
Sam Minnee
c212f40bb5
BUGFIX Use BASE_PATH and BASE_URL instead of data from $_SERVER.
...
API CHANGE: Determine default BASE_PATH/BASE_URL from the __FILE__ content, so that the script that initiated the Sapphire process doesn't matter. This means that index.php doesn't need to manipulate those variables.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Sam Minnee
9ac547d32d
BUGFIX: Don't rely on the current working directory for any file access; use BASE_PATH.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Andreas Piening
f2098eaac7
MINOR: replaced proprietary update query with one that is ANSI compliant in doPublish()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:15 +13:00
Sam Minnee
58cf79731b
BUGFIX: Fixed potential data corruption issue when you are changing the class of a SiteTree subclass between two subclasses that share a fieldname.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:14 +13:00
Sam Minnee
93d09a66fa
BUGFIX #4929 : Fixed Object::add_static_vars() for uninherited static.s
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:14 +13:00
Sam Minnee
9300e52969
API CHANGE #4929 : Add $class argument to DataObjectDecorator::extraStatics()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:14 +13:00
Ingo Schommer
aca7e68b36
MINOR Using SiteTree::get_by_link() in SiteTree->requireDefaultRecords() (see #4590 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:13 +13:00
Andrew Short
46a8083e57
BUGFIX: Fixed nested URLs operation for pages more than 4 levels deep.
...
From: Andrew Short <andrewjshort@gmail.com> (from r95902)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:12 +13:00
Hamish Friedlander
c826191897
BUGFIX: Was using custom_database_fields in Aggregate, not database_fields, and so aggregates for the common fields (LastEdited, Created, ClassName) would fail
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:12 +13:00
Hamish Friedlander
9aa9d936b9
FEATURE: Add partial caching support to SSViewer.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:12 +13:00
Hamish Friedlander
0d76dac5a1
FEATURE: Add aggregate calculation to DataObject, allowing (cached) calculation of Max, Min, Count, Avg, etc
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:11 +13:00
Ingo Schommer
3e8526960b
FEATURE Allowing translation of SiteConfig (including toplevel permission groups)
...
BUGFIX Fixed SiteConfig->canView()/canEdit() to respect empty CanViewType/CanEditType assignments.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:11 +13:00
Geoff Munn
ed5c173366
BUG FIX: The 5.1 replacement array_fill_keys function now made available to the cron jobs
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Sam Minnee
1c851476b6
BUGFIX: Let users without a specific TRANSLATE_ permission edit the default locale, so that things don't break when you install the Translatabe module.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
c21a5bf0ad
BUGFIX Fixed URLSegment access for translated homepages in SiteTree->RelativeLink ( #4781 , thanks martijn)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
ccd9ecd230
API CHANGE Deprecated ContentController->LangAttributes(). Use ContentLocale() instead and write attribute names suitable to XHTML/HTML templates directly in the template.
...
ENHANCEMENT Added ContentController->ContentLocale() to allow XHTML/HTML specific lang= attribute settings in custom template code (see #4858 ). Removed <meta http-equiv="Content-Language"...> tag in SiteTree->MetaTags().
ENHANCEMENT Updated blackcandy theme to use new $ContentLocale attribute to set the locale of the current page (in Page.ss)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Ingo Schommer
ed71153466
MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Sam Minnee
7923628b50
BUGFIX: Fixed bug in r97036
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:10 +13:00
Sam Minnee
5718a6a3d1
BUGFIX: Use locally included Zend framework components in favour of those installed with PEAR
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:09 +13:00