summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Fowler <spider@viovio.com>2010-04-27 04:21:59 +0000
committerChristian Fowler <spider@viovio.com>2010-04-27 04:21:59 +0000
commit2625f8dbe01b997336f14f98267731966cce1192 (patch)
treecffb3317487f605ff97f3bf72d3736c456c32074
parentc50b6f528389a2410331ffd757d919832a1b9a12 (diff)
downloadfisheye-2625f8dbe01b997336f14f98267731966cce1192.tar.gz
fisheye-2625f8dbe01b997336f14f98267731966cce1192.tar.bz2
fisheye-2625f8dbe01b997336f14f98267731966cce1192.zip
add pImmediateRender flag to generateThumbnails and rotateImage
-rw-r--r--FisheyeImage.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/FisheyeImage.php b/FisheyeImage.php
index 00534e6..45534c7 100644
--- a/FisheyeImage.php
+++ b/FisheyeImage.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.114 2010/04/17 22:46:08 wjames5 Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.115 2010/04/27 04:21:59 spiderr Exp $
* @package fisheye
*/
@@ -343,7 +343,7 @@ class FisheyeImage extends FisheyeBase {
return $ret;
}
- function rotateImage( $pDegrees ) {
+ function rotateImage( $pDegrees, $pImmediateRender = FALSE ) {
global $gBitSystem;
if( !empty( $this->mInfo['storage_path'] ) || $this->load() ) {
$fileHash['source_file'] = BIT_ROOT_PATH.$this->mInfo['storage_path'];
@@ -390,7 +390,7 @@ class FisheyeImage extends FisheyeBase {
if( $rotateFunc( $fileHash ) ) {
liberty_clear_thumbnails( $fileHash );
$this->mDb->query( "UPDATE `".BIT_DB_PREFIX."fisheye_image` SET `width`=`height`, `height`=`width` WHERE `content_id`=?", array( $this->mContentId ) );
- $this->generateThumbnails();
+ $this->generateThumbnails( FALSE, $pImmediateRender );
} else {
$this->mErrors['rotate'] = $fileHash['error'];
}
@@ -482,11 +482,11 @@ class FisheyeImage extends FisheyeBase {
}
- function generateThumbnails( $pResizeOriginal=NULL ) {
+ function generateThumbnails( $pResizeOriginal=NULL, $pImmediateRender=FALSE ) {
global $gBitSystem;
$ret = FALSE;
// LibertyMime will take care of thumbnail generation of the offline thumbnailer is not active
- if( $gBitSystem->isFeatureActive( 'liberty_offline_thumbnailer' ) ) {
+ if( $gBitSystem->isFeatureActive( 'liberty_offline_thumbnailer' ) && !$pImmediateRender ) {
$query = "DELETE FROM `".BIT_DB_PREFIX."liberty_process_queue`
WHERE `content_id`=?";
$this->mDb->query( $query, array( $this->mContentId ) );