diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-04-22 16:54:55 +0000 |
| commit | 1f7c1f18c651c58048e92d615c71ac0fe6691c10 (patch) | |
| tree | 4527c4bc08000a07c180cd1fe81792d71195d58b /modules/g2_import | |
| parent | de6f3fce9110b777d61dec97f2a3a61d887a5ccd (diff) | |
| parent | 55da59c942c0f7171b515f0718fea8506ed4b116 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/g2_import')
| -rw-r--r-- | modules/g2_import/helpers/g2_import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 5fd92972..22fb68c6 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -610,7 +610,7 @@ class g2_import_Core { if ($g2_preferred && $g2_preferred instanceof GalleryDerivative) { if (preg_match("/rotate\|(-?\d+)/", $g2_preferred->getDerivativeOperations(), $matches)) { $tmpfile = tempnam(TMPPATH, "rotate"); - gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $matches[1])); + gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $matches[1]), $item); $item->set_data_file($tmpfile); $item->save(); unlink($tmpfile); |