diff options
| author | bitweaver.org <bitweaver@users.sourceforge.net> | 2006-02-18 18:53:27 +0000 |
|---|---|---|
| committer | bitweaver.org <bitweaver@users.sourceforge.net> | 2006-02-18 18:53:27 +0000 |
| commit | 4330b2c5cd356c4bff1a01ddf0f2d16b136b2b7f (patch) | |
| tree | d2543ce7f17b360adff2c1e5ff46b2087debd015 /LibertyContent.php | |
| parent | de4137cc7b8b4ea9342fa460e64d5ab08ebaf22c (diff) | |
| download | liberty-4330b2c5cd356c4bff1a01ddf0f2d16b136b2b7f.tar.gz liberty-4330b2c5cd356c4bff1a01ddf0f2d16b136b2b7f.tar.bz2 liberty-4330b2c5cd356c4bff1a01ddf0f2d16b136b2b7f.zip | |
fix formatGuid with pFromatGuid *is* passed in (like in Preview)
Diffstat (limited to 'LibertyContent.php')
| -rw-r--r-- | LibertyContent.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/LibertyContent.php b/LibertyContent.php index ada7ae2..2bea989 100644 --- a/LibertyContent.php +++ b/LibertyContent.php @@ -3,7 +3,7 @@ * Management of Liberty content * * @package liberty -* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.70 2006/02/18 18:37:18 bitweaver Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.71 2006/02/18 18:53:27 bitweaver Exp $ * @author spider <spider@steelsun.com> */ @@ -1424,9 +1424,11 @@ class LibertyContent extends LibertyBase { // get the format guid into place if( is_array( $pMixed ) && !empty( $pMixed['format_guid'] ) ) { - $format_guid = $pMixed['format_guid']; + $formatGuid = $pMixed['format_guid']; } elseif( empty( $pFormatGuid ) ) { - $format_guid = isset( $this->mInfo['format_guid'] ) ? $this->mInfo['format_guid'] : NULL; + $formatGuid = isset( $this->mInfo['format_guid'] ) ? $this->mInfo['format_guid'] : NULL; + } else { + $formatGuid = $pFormatGuid; } // get the content id if we have one to get @@ -1440,9 +1442,9 @@ class LibertyContent extends LibertyBase { $ret = $data; - if( $data && $format_guid ) { + if( $data && $formatGuid ) { global $gLibertySystem; - if( $func = $gLibertySystem->getPluginFunction( $format_guid, 'load_function' ) ) { + if( $func = $gLibertySystem->getPluginFunction( $formatGuid, 'load_function' ) ) { $ret = $func( $data, $this, $contentId ); } } |