Changeset 1073:8c279d188ea1 for admin/media_item.php

Timestamp:

12/17/12 14:40:06 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Media title may now use the EXIF (original) date if exist instead of file date (see blog prefs). Fixes #1305

File:

• admin/media_item.php (modified) (3 diffs)

admin/media_item.php

@@ -135 +135 @@
 
 # Function to get image title based on meta
-function dcGetImageTitle($file,$pattern)
+function dcGetImageTitle($file,$pattern,$dto_first=false)
 {
      $res = array();
@@ -147 +147 @@
                $res[] = (string) $file->media_meta->{$v};
           } elseif (preg_match('/^Date\((.+?)\)$/u',$v,$m)) {
-               $res[] = dt::str($m[1],$file->media_dt);
+               if ($dto_first && $file->media_meta->DateTimeOriginal) {
+                    $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
+               } else {
+                    $res[] = dt::str($m[1],$file->media_dt);
+               }
           } elseif (preg_match('/^DateTimeOriginal\((.+?)\)$/u',$v,$m) && $file->media_meta->DateTimeOriginal) {
                $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
@@ -214 +218 @@
      {
           $media_type = 'image';
-          $media_desc = dcGetImageTitle($file,$core->blog->settings->system->media_img_title_pattern);
+          $media_desc = dcGetImageTitle($file,
+               $core->blog->settings->system->media_img_title_pattern,
+               $core->blog->settings->system->media_img_use_dto_first);
           if ($media_desc == $file->basename) {
                $media_desc = '';