Skip to content

Commit 1e454b8

Browse files
committed
Use function instead of const array (compatibility with php 5.5)
1 parent c29b11b commit 1e454b8

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

classes/FlickrCommons.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
require_once(__DIR__.'/FlickrAPI.php');
44

55
class FlickrCommons {
6-
const DEFAULT_PARAMS = [
6+
static function defaultParams() {
7+
return [
78
'display-format-photo' => 's',
89
'display-format-photo-lightbox' => 'z',
910
'photoset-title-tag' => 'h4',
1011
'photoset-description-tag' => 'h5',
1112
'collection-title-tag' => 'h3',
1213
'collection-description-tag' => 'h5'
13-
];
14+
];
15+
}
1416
}

shortcodes/FlickrCollectionShortcode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function init()
1717
$content = $sc->getContent();
1818
$id = $sc->getParameter('id', '');
1919
$api = new FlickrAPI();
20-
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
20+
$params = array_merge(FlickrCommons::defaultParams(), $sc->getParameters());
2121
try {
2222
$collection = $api->collection($id );
2323
$output = $this->twig->processTemplate('partials/flickr-collection.html.twig', [

shortcodes/FlickrPhotoShortcode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function init()
1717
$content = $sc->getContent();
1818
$id = $sc->getParameter('id', '');
1919
$api = new FlickrAPI();
20-
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
20+
$params = array_merge(FlickrCommons::defaultParams(), $sc->getParameters());
2121
try {
2222
$photo = $api->photo($id );
2323
$output = $this->twig->processTemplate('partials/flickr-photo.html.twig', [

shortcodes/FlickrPhotosetShortcode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function init()
1717
$content = $sc->getContent();
1818
$id = $sc->getParameter('id', '');
1919
$api = new FlickrAPI();
20-
$params = array_merge(FlickrCommons::DEFAULT_PARAMS, $sc->getParameters());
20+
$params = array_merge(FlickrCommons::defaultParams(), $sc->getParameters());
2121
try {
2222
$photoset = $api->photoset($id, $params );
2323
$output = $this->twig->processTemplate('partials/flickr-photoset.html.twig', [

0 commit comments

Comments
 (0)