Changeset 6340 for trunk/include

Timestamp:

May 24, 2010, 10:16:11 PM (15 years ago)

Author:

plg

Message:

merge r6338 from branch 2.1 to trunk

bug 1694 fixed: COMPUTED Exif fields were not displayed on picture.php

Location:

trunk

Files:

• . (modified) (1 prop)
• include (modified) (1 prop)
• include/block.class.php (modified) (1 prop)
• include/calendar_base.class.php (modified) (1 prop)
• include/calendar_monthly.class.php (modified) (1 prop)
• include/calendar_weekly.class.php (modified) (1 prop)
• include/category_cats.inc.php (modified) (1 prop)
• include/category_default.inc.php (modified) (1 prop)
• include/class_smtp_mail.inc.php (modified) (1 prop)
• include/common.inc.php (modified) (1 prop)
• include/config_default.inc.php (modified) (1 prop)
• include/constants.php (modified) (1 prop)
• include/feedcreator.class.php (modified) (1 prop)
• include/filter.inc.php (modified) (1 prop)
• include/functions.inc.php (modified) (1 prop)
• include/functions_calendar.inc.php (modified) (1 prop)
• include/functions_category.inc.php (modified) (1 prop)
• include/functions_comment.inc.php (modified) (1 prop)
• include/functions_cookie.inc.php (modified) (1 prop)
• include/functions_filter.inc.php (modified) (1 prop)
• include/functions_html.inc.php (modified) (1 prop)
• include/functions_mail.inc.php (modified) (1 prop)
• include/functions_metadata.inc.php (modified) (1 prop)
• include/functions_notification.inc.php (modified) (1 prop)
• include/functions_picture.inc.php (modified) (1 prop)
• include/functions_plugins.inc.php (modified) (1 prop)
• include/functions_rate.inc.php (modified) (1 prop)
• include/functions_search.inc.php (modified) (1 prop)
• include/functions_session.inc.php (modified) (1 prop)
• include/functions_tag.inc.php (modified) (1 prop)
• include/functions_url.inc.php (modified) (1 prop)
• include/functions_user.inc.php (modified) (1 prop)
• include/functions_xml.inc.php (modified) (1 prop)
• include/index.php (modified) (1 prop)
• include/menubar.inc.php (modified) (1 prop)
• include/no_photo_yet.inc.php (modified) (1 prop)
• include/page_header.php (modified) (1 prop)
• include/page_tail.php (modified) (1 prop)
• include/picture_comment.inc.php (modified) (1 prop)
• include/picture_metadata.inc.php (modified) (1 diff, 1 prop)
• include/picture_rate.inc.php (modified) (1 prop)
• include/section_init.inc.php (modified) (1 prop)
• include/template.class.php (modified) (1 prop)
• include/user.inc.php (modified) (1 prop)
• include/ws_core.inc.php (modified) (1 prop)
• include/ws_functions.inc.php (modified) (1 prop)

trunk/include/picture_metadata.inc.php

@@ -68 +68 @@
       {
         $tokens = explode(';', $field);
-        if (isset($exif[$tokens[0]][$tokens[1]]))
+        if (isset($exif[$field]))
         {
           $key = $tokens[1];
-          if (isset($lang['exif_field_'.$tokens[1]]))
+          if (isset($lang['exif_field_'.$key]))
           {
-            $key = $lang['exif_field_'.$tokens[1]];
+            $key = $lang['exif_field_'.$key];
           }
-          $tpl_meta['lines'][$key] = $exif[$tokens[0]][$tokens[1]];
+          $tpl_meta['lines'][$key] = $exif[$field];
         }
       }