diff options
| -rw-r--r-- | LibertyAttachable.php | 4 | ||||
| -rw-r--r-- | LibertyContent.php | 4 | ||||
| -rw-r--r-- | plugins/format.tikiwiki.php | 4 | ||||
| -rw-r--r-- | templates/content_permissions.tpl | 2 | ||||
| -rw-r--r-- | templates/content_permissions_inc.tpl | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/LibertyAttachable.php b/LibertyAttachable.php index 2ebe9e2..54d4db7 100644 --- a/LibertyAttachable.php +++ b/LibertyAttachable.php @@ -3,7 +3,7 @@ * Management of Liberty Content * * @package liberty - * @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyAttachable.php,v 1.120 2007/08/02 23:37:59 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyAttachable.php,v 1.121 2007/08/10 18:52:53 spiderr Exp $ * @author spider <spider@steelsun.com> */ // +----------------------------------------------------------------------+ @@ -119,7 +119,7 @@ class LibertyAttachable extends LibertyContent { // Process a JPEG if( function_exists( 'exif_read_data' ) && !empty( $pParamHash['upload']['tmp_name'] ) && stripos( $pParamHash['upload']['type'], 'jpeg' ) !== FALSE ) { - $exifHash = exif_read_data( $pParamHash['upload']['tmp_name'], 0, true); + $exifHash = @exif_read_data( $pParamHash['upload']['tmp_name'], 0, true); //vd( $exifHash ); require_once UTIL_PKG_PATH.'jpeg_metadata_tk/JPEG.php'; // Change: Allow this example file to be easily relocatable - as of version 1.11 diff --git a/LibertyContent.php b/LibertyContent.php index 76a42ba..2131246 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.277 2007/08/10 18:33:40 spiderr Exp $ +* @version $Header: /cvsroot/bitweaver/_bit_liberty/LibertyContent.php,v 1.278 2007/08/10 18:52:53 spiderr Exp $ * @author spider <spider@steelsun.com> */ @@ -1490,7 +1490,7 @@ vd( $ret ); * @param array different possibilities depending on derived class * @return string Formated URL address to display the page. */ - function getDisplayUri( $pContentId, $pMixed=NULL ) { + function getDisplayUri( $pContentId=NULL, $pMixed=NULL ) { return BIT_ROOT_URI.substr( $this->getDisplayUrl( $pContentId, $pMixed ), 1 ); } diff --git a/plugins/format.tikiwiki.php b/plugins/format.tikiwiki.php index 375f750..d7e1e36 100644 --- a/plugins/format.tikiwiki.php +++ b/plugins/format.tikiwiki.php @@ -1,6 +1,6 @@ <?php /** - * @version $Revision: 1.111 $ + * @version $Revision: 1.112 $ * @package liberty */ global $gLibertySystem; @@ -240,7 +240,7 @@ class TikiWikiParser extends BitBase { } } else { // we are parsing this page and we either have no way of checking permissions or we have no need for html - $data = htmlspecialchars( $data, ENT_NOQUOTES, 'UTF-8' ); +// $data = htmlspecialchars( $data, ENT_NOQUOTES, 'UTF-8' ); } // Extract [link] sections (to be re-inserted later) diff --git a/templates/content_permissions.tpl b/templates/content_permissions.tpl index ab88245..d1f6d1b 100644 --- a/templates/content_permissions.tpl +++ b/templates/content_permissions.tpl @@ -55,7 +55,7 @@ </a> </span> {else} - {smartlink itra=false ititle="`$contentPerms.groups.$groupId.group_name` :: $perm" ibiticon=icons/$size$icon action=$action content_id=$gContent->mContentId perm=$perm group_id=$groupId} + {smartlink itra=false ititle="`$contentPerms.groups.$groupId.group_name` :: $perm" ibiticon=icons/$size$icon iforce="icon" action=$action content_id=$gContent->mContentId perm=$perm group_id=$groupId} {/if} </td> {/foreach} diff --git a/templates/content_permissions_inc.tpl b/templates/content_permissions_inc.tpl index f90e1f2..2fd535f 100644 --- a/templates/content_permissions_inc.tpl +++ b/templates/content_permissions_inc.tpl @@ -25,7 +25,7 @@ {assign var=action value="remove"} {/if} {/foreach} - <td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon action=$action content_id=$gContent->mContentId perm=$perm.perm_name group_id=$group.group_id}</td> + <td style="text-align:center">{smartlink ititle=Allow ibiticon=$icon iforce="icon" action=$action content_id=$gContent->mContentId perm=$perm.perm_name group_id=$group.group_id}</td> </tr> {/foreach} </table> @@ -83,7 +83,7 @@ <td>{$perm.group_name}</td> <td>{$perm.perm_desc} <em>({$perm.perm_name})</em></td> <td align="right"> - {smartlink ititle="Remove Permission" ibiticon="icons/edit-delete" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id} + {smartlink ititle="Remove Permission" ibiticon="icons/edit-delete" iforce="icon" action=remove content_id=$gContent->mContentId perm=$perm.perm_name group_id=$perm.group_id} </td> </tr> {foreachelse} |