adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix function get_fulldirs - works correctly eent for wrong params (virtual cats)

Browse Source 
- fix functions_metadata.php - could not be included from inside another function 

git-svn-id: http://piwigo.org/svn/trunk@2560 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2008-09-21 11:06:20 +00:00
parent a0a0511a6f
commit 93fb07841f
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_metadata.php
+4 -5
View File
@@ -23,11 +23,10 @@
include_once(PHPWG_ROOT_PATH.'/include/functions_metadata.inc.php');
$page['datefields'] = array('date_creation', 'date_available');
function get_sync_iptc_data($file)
{
global $conf, $page;
global $conf;
$map = $conf['use_iptc_mapping'];
@@ -35,7 +34,7 @@ function get_sync_iptc_data($file)
foreach ($iptc as $pwg_key => $value)
{
if (in_array($pwg_key, $page['datefields']))
if (in_array($pwg_key, array('date_creation', 'date_available')))
{
if (preg_match('/(\d{4})(\d{2})(\d{2})/', $value, $matches))
{
@@ -71,13 +70,13 @@ function get_sync_iptc_data($file)
function get_sync_exif_data($file)
{
global $conf, $page;
global $conf;
$exif = get_exif_data($file, $conf['use_exif_mapping']);
foreach ($exif as $pwg_key => $value)
{
if (in_array($pwg_key, $page['datefields']))
if (in_array($pwg_key, array('date_creation', 'date_available')))
{
if (preg_match('/^(\d{4}).(\d{2}).(\d{2})/', $value, $matches))
{