Skip to content

SilverStripe 3.0 compatibility #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarrenInwood wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SilverStripe 3.0 compatibility #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
432e301
Changes to make compatible with SS3.0
Jul 14, 2015
21aad4e
Change composer file to allow installation with SS3.0
Jul 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/CloudBucket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function getLinkFor($f, $linkType = self::LINK_SMART) {
break;

default:
$ssl = Director::is_https() && !empty($this->secureURL);
$ssl = (Director::protocol() == 'https://') && !empty($this->secureURL);
$field = $ssl ? 'secureURL' : 'baseURL';
}

Expand Down
4 changes: 2 additions & 2 deletions code/wrappers/CloudImage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
class CloudImage extends Image implements CloudAssetInterface
{
private static $has_many = array(
public static $has_many = array(
'DerivedImages' => 'CloudImageCachedStore',
);

Expand Down Expand Up @@ -90,7 +90,7 @@ function getDimensions($dim = "string") {
* @param string $format The name of the format.
* @return CloudImageCached|null
*/
public function getFormattedImage($format) {
public function getFormattedImage($format, $arg1 = NULL, $arg2 = NULL) {
$args = func_get_args();
$logger = CloudAssets::inst()->getLogger();

Expand Down
6 changes: 3 additions & 3 deletions code/wrappers/CloudImageCachedStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
*/
class CloudImageCachedStore extends DataObject
{
private static $db = array(
public static $db = array(
'Filename' => 'Varchar(255)',
'CloudStatus' => "Enum('Local,Live,Error','Local')",
'CloudSize' => 'Int',
'CloudMetaJson' => 'Text', // saves any bucket or file-type specific information
);

private static $has_one = array(
public static $has_one = array(
'Source' => 'CloudImage',
);

private static $indexes = array(
public static $indexes = array(
'Filename' => true,
);

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}
},
"require": {
"silverstripe/framework": ">=3.1"
"silverstripe/framework": "~3.0"
},
"suggest": {
"markguinn/silverstripe-cloudassets-rackspace": "Rackspace bucket driver",
Expand Down