@@ -181,11 +181,11 @@ |
||
181 | 181 | // Check if this field is an Address field. |
182 | 182 | if (isset($address['address_line1'])) { |
183 | 183 | // Format the address as a single string. |
184 | - $string .= $address['address_line1'] . "\n"; |
|
185 | - $string .= !empty($address['address_line2']) ? $address['address_line2'] . "\n" : ''; |
|
186 | - $string .= $address['locality'] . ', '; |
|
187 | - $string .= str_replace('US-', '', $address['administrative_area']) . ' '; |
|
188 | - $string .= $address['postal_code'] . "\n"; |
|
184 | + $string .= $address['address_line1']."\n"; |
|
185 | + $string .= !empty($address['address_line2']) ? $address['address_line2']."\n" : ''; |
|
186 | + $string .= $address['locality'].', '; |
|
187 | + $string .= str_replace('US-', '', $address['administrative_area']).' '; |
|
188 | + $string .= $address['postal_code']."\n"; |
|
189 | 189 | $string .= $address['country_code']; |
190 | 190 | } |
191 | 191 |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $image_names = explode(',', $images); |
20 | 20 | $files = []; |
21 | 21 | foreach ($image_names as $image_name) { |
22 | - $path = dirname($this->configuration['path']) . '/images/' . $image_name; |
|
22 | + $path = dirname($this->configuration['path']).'/images/'.$image_name; |
|
23 | 23 | $data = file_get_contents($path); |
24 | 24 | $uri = file_build_uri($image_name); |
25 | 25 | $files[] = file_save_data($data, $uri); |
@@ -11,14 +11,14 @@ |
||
11 | 11 | function df_tools_gallery_library_info_alter(&$libraries, $extension) { |
12 | 12 | // Optionally use the Libraries module to determine our library paths. |
13 | 13 | if ($extension == 'df_tools_gallery' && \Drupal::moduleHandler()->moduleExists('libraries')) { |
14 | - $imagesloaded_path = libraries_get_path('imagesloaded') . '/imagesloaded.pkgd.min.js'; |
|
15 | - $masonry_path = libraries_get_path('masonry') . '/dist/masonry.pkgd.min.js'; |
|
14 | + $imagesloaded_path = libraries_get_path('imagesloaded').'/imagesloaded.pkgd.min.js'; |
|
15 | + $masonry_path = libraries_get_path('masonry').'/dist/masonry.pkgd.min.js'; |
|
16 | 16 | $lightbox2_path = libraries_get_path('lightbox2'); |
17 | 17 | |
18 | - $libraries['lightbox2']['css']['theme'] = ['/' . $lightbox2_path . '/dist/css/lightbox.min.css' => []]; |
|
19 | - $libraries['lightbox2']['js'] = ['/' . $lightbox2_path . '/dist/js/lightbox.min.js' => ['minified' => 'true']]; |
|
20 | - $libraries['imagesloaded']['js'] = ['/' . $imagesloaded_path => ['minified' => 'true']]; |
|
21 | - $libraries['masonry']['js'] = ['/' . $masonry_path => ['minified' => 'true']]; |
|
18 | + $libraries['lightbox2']['css']['theme'] = ['/'.$lightbox2_path.'/dist/css/lightbox.min.css' => []]; |
|
19 | + $libraries['lightbox2']['js'] = ['/'.$lightbox2_path.'/dist/js/lightbox.min.js' => ['minified' => 'true']]; |
|
20 | + $libraries['imagesloaded']['js'] = ['/'.$imagesloaded_path => ['minified' => 'true']]; |
|
21 | + $libraries['masonry']['js'] = ['/'.$masonry_path => ['minified' => 'true']]; |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 |