aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CVS/Entries2
-rwxr-xr-xexif.module18
2 files changed, 1 insertions, 19 deletions
diff --git a/CVS/Entries b/CVS/Entries
index 7547316..6b8993b 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,7 +1,7 @@
-D/exif_helper////
D/exif_location////
/exif.class.php/1.1.2.16/Result of merge//TDRUPAL-6--1
/README.txt/1.6/Thu Oct 7 21:44:03 2010//
/exif.info/1.4/Thu Oct 7 21:44:03 2010//
/exif.install/1.4/Thu Oct 7 21:44:03 2010//
/exif.module/1.9/Result of merge+Thu Oct 7 21:44:03 2010//
+D/po////
diff --git a/exif.module b/exif.module
index 2f41afb..3853eb4 100755
--- a/exif.module
+++ b/exif.module
@@ -44,21 +44,7 @@ function exif_nodeapi(&$node, $op, $teaser) {
$fid, $ifd, $tag, $value);
}
}
-<<<<<<< exif.module
- case 'insert':
- if (! _exif_check_for_exif_data($node->type)) {
- return;
- }
-
- $info = content_types($node->type);
- $fields = $info['fields'];
- $exif = _exif_get_class();
-
- //get all the fields that will be filled with exif data
- $ar_exif_fields = $exif->getExifFields($fields);
-=======
break;
->>>>>>> 1.9
case 'load':
$fid = db_result(db_query("SELECT fid FROM {files} WHERE filepath = '%s'", $node->images[IMAGE_ORIGINAL]));
@@ -347,9 +333,6 @@ function theme_exif_table($node) {
$rows[] = $row;
}
}
-<<<<<<< exif.module
-}
-=======
if (empty($rows)) {
return '';
@@ -377,4 +360,3 @@ function _exif_bootstrap() {
include_once drupal_get_path('module', 'exif') .'/pel/PelJpeg.php';
}
->>>>>>> 1.9