Andrew O'Neil
e933d61a1c
Merged r71795 from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:12 +13:00
Sean Harvey
bb583293a6
BUGFIX Fix call to undefined "_12Hour" function (merged from r73523)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
bd6185aed8
BUGFIX Added missing action 'DeleteImageForm' to Image::$allowed_actions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73318 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
49367c87d3
BUGFIX Added missing action 'EditImageForm' to Image::$allowed_actions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73304 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
22a1bf8781
BUGFIX Fixed too strict permission checking on Image::$allowed_actions. Replaced broken * permission check with explicit method names
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73301 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
359eb306f6
BUGFIX Fixed array to string conversion caused by patch commited in r73285
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73299 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
e46ecdc1f8
BUGFIX Using $allowed_actions in Image_Uploader (Merged from r73255)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73291 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:11 +13:00
Sean Harvey
9426be792f
BUGFIX Checking for Director::is_site_url() before redirecting in Controller->redirectBack() and MemberLoginForm (Merged from r73252)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73288 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sean Harvey
d61ba29d42
BUGFIX Added isDev() and Permission::check() directives to DatabaseAdmin and DevelopmentAdmin (Merged from r73251)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sean Harvey
5ddfb9e2e0
BUGFIX Fixed Director::makeRelative() to accept https:// protocol
...
BUGFIX Fixed GET-parameter replacement in Director::is_absolute_url()
ENHANCEMENT Added Director::is_relative_url() and Director::is_site_url()
BUGFIX Validating $_FILES array in Director::direct()
(Merged from r73250)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sam Minnee
87da8341a0
BUGFIX: Interpret 401s and 403s created init() methods as 'finished' requests
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Andrew O'Neil
66a1610d48
ENHANCEMENT: Allow calling methods on DataObjects using RESTful API. Methods which can be called must be specified in the $allowed_actions array of the DataObject.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73149 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sam Minnee
eeb07e221f
BUGFIX: Fix notice-level error in rewriteless operation of homepage when db needs to be created
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@73099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Andrew O'Neil
842ae9f540
MINOR: Remove debug message
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:10 +13:00
Sam Minnee
fbbee0f354
BUGFIX #3591 : Make Controller::isAjax() more reliable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72926 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Andrew O'Neil
2a5c2910b8
BUGFIX: #3529 - SilverStripeNavigator causes strict XHTML pages to fail in Firefox (michaek)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Andrew O'Neil
0a6f963048
MINOR: #3675 - Correct phpdoc of DataObjectSet sort functions (bgribaudo)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Andrew O'Neil
43f62244df
FEATURE: #3610 - Require ADMIN permissions for ?flush=all
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72763 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Sam Minnee
c5ad96953a
ENHANCEMENT: Made JS i18n optional; disable it by calling Requirements::set_js_i18n(false)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72574 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Sam Minnee
8dc652aaa8
BUGFIX: Updated i18n javascript system so that the i18n javascript needs to be explicitly included, so that it doesn't poke its nose in where it's not wanted.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:09 +13:00
Sam Minnee
a1e48eff8e
ENHANCEMENT: Database will fix itself if you view the site and the database doesn't exist
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Sam Minnee
d904c0b8d0
ENHANCEMENT: Added BASE_SCRIPT_URL that lets you run a site without rewriting rules
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Andrew O'Neil
7684133012
BUGFIX: #3644 - _ss_environment.php search creates open_basedir error (ed)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Ingo Schommer
dd6ff797e2
MINOR Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Sam Minnee
15e91d6c97
BUGFIX: Ensure that $this->class is set on ArrayData objects
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Sam Minnee
5319534891
BUGFIX: Allow SilverStripe to work when asp_tags is on
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Sam Minnee
5a602720e6
BUGFIX: Memory usage improvements to CsvBulkLoader and Member::onBeforeWrite()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72252 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:08 +13:00
Will Rossiter
7ead4294b1
BUGFIX: fixed syntax fail in silverstripe navigator
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Sam Minnee
c931eb10fb
BUGFIX: Prevent infinite redirection when the homepage isn't available, when using modules such as subsites.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Sam Minnee
027cf020b7
ENHANCEMENT #3232 lenix: Added Date::FormatI18N()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Sam Minnee
4aac47340b
Add caching to needlessly repeated SQL calls.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72007 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Normann Lou
d4a1087cb8
BUGFIX: In SSViewer::parseTemplateContent($content, $template=""), when the $content is a xml template, we should not wrap anything around it, for web browser able to correct parse the xml
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Normann Lou
0e2345c253
Undo the change committed in r71918 since the commit message is missing
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71921 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Normann Lou
fadb2c50fd
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Andrew O'Neil
649ce069e7
BUGFIX: #3481 - Check if classes exist before trying to instantiate a singleton on database build, to work around stale manifest errors
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:07 +13:00
Andrew O'Neil
203edb713b
BUGFIX: Fix wrong conditional
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
Andrew O'Neil
d0ffe4561a
FEATURE: Allow combined files to be disabled
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71761 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
Ingo Schommer
931182d0b2
BUGFIX BUGFIX Fixed redirection to external URLs through Security/login with BackURL parameter (merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71709 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
Andrew O'Neil
4cbf0d60ae
BUGFIX: Disable DataObject validation temporarily while importing yaml fixtures
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
Normann Lou
3778a67274
BUGFIX: i18n::include_by_locale() should skip check the web root level and ../webroot level for language file, this is not only "not necessary" but also "must" because some server configuration prevent from any file access above the site root folder.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@71499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:06 +13:00
James Kirkus-Lamont
ed0905870b
BUGFIX removed extra colon appearing in SilverStripeNavigator
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
65e3917fef
Don't let content negotiator clobber the mime types of things other than HTML & XHTML
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
3131b476a6
Replaced HTTPReponse settings of Content-type header with Content-Type, to match RestfulServer
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
d53962ade9
MINOR Ensure that $result is defined before calling array functions on it in SiteTree::getClassDropdown()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
67d6d81e76
BUGFIX $hide_ancestor hides Page as well when set from multiple subclasses of Page. Thanks dio5!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
abcf34ef98
BUGFIX #3415 ajshort: Requesting root page via ajax now preserves isAjax value.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
dec5108f16
BUGFIX:
...
1. If DataObjectDecorator::extraFields() return an numeric array for its summary field, it need to convert to associative array like what DataObject did.
2. Not all DataObject has a 'Title' database field, but all DataObject has a 'Title' field due to function DataObject::getTitle() exists.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
01e715212c
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70696 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Will Rossiter
d0da8b8796
MINOR: fix for ticket 3384. Instead of messing round with added requirements back if you cannot merge them just return
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Normann Lou
e855e4d126
MINOR: in-line documentation correction
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00