Skip to content

Commit 4af6521

Browse files
committed
Merge branch 'issue#110'
Closes #110
2 parents 1a34c05 + 3b49af2 commit 4af6521

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

docs/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ Furthermore, quite a few bugfixes have been been made. Most of them related to t
1313
* [issue#105](https://github.com/jeroenrnl/zoph/issues/105), [issue#106](https://github.com/jeroenrnl/zoph/issues/106), [issue#108](https://github.com/jeroenrnl/zoph/issues/108): Several issues with the search results page
1414
* [issue#107](https://github.com/jeroenrnl/zoph/issues/107): ">", ">=", "<" and "<=" are pointless for text searches
1515
* [issue#109](https://github.com/jeroenrnl/zoph/issues/109): Autocomplete dropdown sometimes hidden behind map
16+
* [issue#110](https://github.com/jeroenrnl/zoph/issues/110): 'show all EXIF' button doesn't work
1617

1718
#### Refactor ####
1819
* Removed unused functions in util.inc.php
1920
* Removing ancient scripts that are either redundant or no longer working
2021
* [issue#100](https://github.com/jeroenrnl/zoph/issues/100): Deprecate ssl.force, url.http and url.https
2122
As of **Zoph 0.9.9** these settings will be removed. Zoph warns you if you are using them as of **Zoph 0.9.8**. If you feel your Zoph installation can not do without these settings, please comment in this issue.
22-
23+
* [issue#110](https://github.com/jeroenrnl/zoph/issues/110): Changed deprecated `read_exif_data()` to `exif_read_data()`
2324

2425
## Zoph 0.9.7 ##
2526
### 19 jan 2018 ###

php/classes/photo.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,9 +1167,9 @@ public function getRelationDesc(photo $photo) {
11671167
*/
11681168
public function exifToHTML() {
11691169
if (exif_imagetype($this->getFilePath())==IMAGETYPE_JPEG) {
1170-
$exif=read_exif_data($this->getFilePath());
1170+
$exif=exif_read_data($this->getFilePath());
11711171
if ($exif) {
1172-
$return="<dl class='allexif'>\n";
1172+
$return="<dl id='allexif'>\n";
11731173

11741174
foreach ($exif as $key => $value) {
11751175
if (!is_array($value)) {

php/exif.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function process_exif($image) {
3131
$mime=$file->getMime();
3232

3333
if ($mime == "image/jpeg") {
34-
$exif = read_exif_data($image);
34+
$exif = exif_read_data($image);
3535
} else {
3636
$exif = false;
3737
}

php/templates/default/css.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,12 +1359,12 @@
13591359
text-align: right;
13601360
}
13611361

1362-
dl.allexif {
1362+
dl#allexif {
13631363
display: none;
13641364
width: 100%;
13651365
}
13661366

1367-
dl.allexif dl {
1367+
dl#allexif dl {
13681368
width: 100%
13691369
}
13701370

0 commit comments

Comments
 (0)