summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspiderr <spider@viovio.com>2011-07-12 01:22:47 -0400
committerspiderr <spider@viovio.com>2011-07-12 01:22:47 -0400
commitc4d4c5c6a31cab166a339017801fe8bf58a067af (patch)
tree48d94e31f5d0403f03c90042370b3e3835d3a9d5
parent70e1d4c5281e3939c1971c77af4d35492b139422 (diff)
downloadutil-c4d4c5c6a31cab166a339017801fe8bf58a067af.tar.gz
util-c4d4c5c6a31cab166a339017801fe8bf58a067af.tar.bz2
util-c4d4c5c6a31cab166a339017801fe8bf58a067af.zip
silence NOTICEs
-rw-r--r--jpeg_metadata_tk/EXIF_Makernote.php4
-rw-r--r--jpeg_metadata_tk/Photoshop_File_Info.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/jpeg_metadata_tk/EXIF_Makernote.php b/jpeg_metadata_tk/EXIF_Makernote.php
index 9eb64ae..ceb82f4 100644
--- a/jpeg_metadata_tk/EXIF_Makernote.php
+++ b/jpeg_metadata_tk/EXIF_Makernote.php
@@ -131,7 +131,7 @@ function Read_Makernote_Tag( $Makernote_Tag, $EXIF_Array, $filehnd )
// Check if the Makernote is present but empty - this sometimes happens
if ( ( strlen( $Makernote_Tag['Data'] ) === 0 ) ||
- ( $Makernote_Tag['Data'] === str_repeat ( "\x00", strlen( $Makernote_Tag['Data'] )) ) )
+ ( is_string( $Makernote_Tag['Data'] ) && $Makernote_Tag['Data'] === str_repeat ( "\x00", strlen( $Makernote_Tag['Data'] )) ) )
{
// Modify the makernote to display that it is empty
$Makernote_Tag['Decoded Data'] = "Empty";
@@ -331,4 +331,4 @@ function Interpret_Makernote_to_HTML( $Makernote_tag, $filename )
-?> \ No newline at end of file
+?>
diff --git a/jpeg_metadata_tk/Photoshop_File_Info.php b/jpeg_metadata_tk/Photoshop_File_Info.php
index 2604769..1da7a8c 100644
--- a/jpeg_metadata_tk/Photoshop_File_Info.php
+++ b/jpeg_metadata_tk/Photoshop_File_Info.php
@@ -177,9 +177,9 @@ function get_photoshop_file_info( $Exif_array, $XMP_array, $IRB_array )
if ( $Item != FALSE )
{
// Ensure that the Creator value exists and save it.
- if ( ( array_key_exists( 'children', $Item ) ) &&
+ if ( ( !empty( $Item['children'][0] ) ) &&
( $Item['children'][0]['tag'] =="rdf:Seq" ) &&
- ( array_key_exists( 'value', $Item['children'][0]['children'][0] ) ) )
+ ( !empty( $Item['children'][0]['children'][0]['empty'] ) ) )
{
$outputarray = add_to_field( $outputarray, 'author' , HTML_UTF8_Escape( $Item['children'][0]['children'][0]['value'] ), "\n" );
}