diff options
| -rw-r--r-- | admin/schema_inc.php | 1 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 2 | ||||
| -rw-r--r-- | includes/classes/LibertyContent.php | 11 | ||||
| -rw-r--r-- | templates/html_head_inc.tpl | 31 |
4 files changed, 29 insertions, 16 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index a13d0ac..317c687 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -267,6 +267,7 @@ $indices = array ( 'liberty_content_perm_perm_idx' => array( 'table' => 'liberty_content_permissions', 'cols' => 'perm_name', 'opts' => NULL ), 'liberty_content_perm_cont_idx' => array( 'table' => 'liberty_content_permissions', 'cols' => 'content_id', 'opts' => NULL ), 'process_id_idx' => array( 'table' => 'liberty_process_queue', 'cols' => 'content_id', 'opts' => NULL ), + 'liberty_content_data_idx' => array( 'table' => 'liberty_content_data', 'cols' => 'content_id', 'opts' => NULL ), 'lib_attachment_meta_idx' => array( 'table' => 'liberty_attachment_meta_data', 'cols' => 'attachment_id', 'opts' => NULL ), 'lib_attachment_meta_type_idx' => array( 'table' => 'liberty_attachment_meta_data', 'cols' => 'meta_type_id', 'opts' => NULL ), 'lib_attachment_meta_title_idx' => array( 'table' => 'liberty_attachment_meta_data', 'cols' => 'meta_title_id', 'opts' => NULL ), diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 83039db..1f99cc4 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -274,7 +274,7 @@ array( 'QUERY' => array( 'SQL92' => array( "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `content_id`=(SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`page_id`=`".BIT_DB_PREFIX."liberty_content_history`.`page_id`)", "UPDATE `".BIT_DB_PREFIX."liberty_content` SET version=(SELECT `version` from `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`content_id`=`".BIT_DB_PREFIX."liberty_content`.`content_id`)", - "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `summary`=`decription`", + "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `summary`=`description`", )), ), diff --git a/includes/classes/LibertyContent.php b/includes/classes/LibertyContent.php index 0d8c005..0170312 100644 --- a/includes/classes/LibertyContent.php +++ b/includes/classes/LibertyContent.php @@ -342,6 +342,7 @@ class LibertyContent extends LibertyBase implements BitCacheable { } } $pParamHash['data_store']['summary'] = !empty( $pParamHash['summary'] ) ? $pParamHash['summary'] : NULL ; + $pParamHash['data_store']['metatags'] = !empty( $pParamHash['metatags'] ) ? $pParamHash['metatags'] : NULL ; // call verify service to see if any services have errors $this->invokeServices( 'content_verify_function', $pParamHash ); @@ -951,6 +952,12 @@ class LibertyContent extends LibertyBase implements BitCacheable { LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON( lc.`content_id` = lcds.`content_id` AND lcds.`data_type` = ? )"; $pQueryHash['join']['var'][] = 'summary'; } + if( empty( $pJoins ) || in_array( 'metatags', $pJoins )) { + $pQueryHash['select']['sql'][] = "lcdm.`data` AS `metatags`"; + $pQueryHash['join']['sql'][] = " + LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcdm ON( lc.`content_id` = lcdm.`content_id` AND lcdm.`data_type` = ? )"; + $pQueryHash['join']['var'][] = 'metatags'; + } if( empty( $pJoins ) || in_array( 'hits', $pJoins )) { $pQueryHash['select']['sql'][] = "lch.`hits`, lch.`last_hit`"; $pQueryHash['join']['sql'][] = " @@ -2749,13 +2756,15 @@ class LibertyContent extends LibertyBase implements BitCacheable { lc.`ip`, lc.`created`, lc.`content_id`, - lcds.`data` AS `summary` + lcds.`data` AS `summary`, + lcdm.`data` AS `metatags` $selectSql FROM `".BIT_DB_PREFIX."liberty_content` lc INNER JOIN `".BIT_DB_PREFIX."users_users` uuc ON (lc.`user_id`=uuc.`user_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."users_users` uue ON (lc.`modifier_user_id`=uue.`user_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_hits` lch ON( lc.`content_id` = lch.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcds ON (lc.`content_id` = lcds.`content_id` AND lcds.`data_type`='summary') + LEFT OUTER JOIN `".BIT_DB_PREFIX."liberty_content_data` lcdm ON (lc.`content_id` = lcdm.`content_id` AND lcdm.`data_type`='metatags') $joinSql $whereSql ORDER BY ".$orderTable.$this->convertSortMode($pListHash['sort_mode']); diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl index 4d3e251..5665c7e 100644 --- a/templates/html_head_inc.tpl +++ b/templates/html_head_inc.tpl @@ -12,19 +12,22 @@ {* perhaps we can remove this as well at some point and load it using $gBitThemes->loadJavascript(); *} -{if $gBitSystem->isFeatureActive('comments_ajax')} - <script src="{$smarty.const.LIBERTY_PKG_URL}scripts/LibertyComment.js" type="text/javascript"></script> - <script type="text/javascript"> - LibertyComment.ROOT_ID = {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if}; {* this is the content id - would be better as part of something in kernel but here it is until that day *} - LibertyComment.ROOT_GUID = "{if $gContent->mContentTypeGuid}{$gContent->mContentTypeGuid}{/if}"; - LibertyComment.SORT_MODE = "{$comments_sort_mode}"; - LibertyComment.BROWSER = "{$gBrowserInfo.browser}"; - </script> -{/if} -{if $gContent->mContentTypeGuid} - <script type="text/javascript"> - LibertyContent = {ldelim}{rdelim}; - LibertyContent.CONTENT_TYPE_GUID = "{$gContent->mContentTypeGuid}"; - </script> +{if $gContent} + {if $gBitSystem->isFeatureActive('comments_ajax')} + <script src="{$smarty.const.LIBERTY_PKG_URL}scripts/LibertyComment.js" type="text/javascript"></script> + <script type="text/javascript"> + LibertyComment.ROOT_ID = {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if}; {* this is the content id - would be better as part of something in kernel but here it is until that day *} + LibertyComment.ROOT_GUID = "{if $gContent->mContentTypeGuid}{$gContent->mContentTypeGuid}{/if}"; + LibertyComment.SORT_MODE = "{$comments_sort_mode}"; + LibertyComment.BROWSER = "{$gBrowserInfo.browser}"; + </script> + {/if} + {if $gContent->mContentTypeGuid} + <script type="text/javascript"> + LibertyContent = {ldelim}{rdelim}; + LibertyContent.CONTENT_TYPE_GUID = "{$gContent->mContentTypeGuid}"; + </script> + {/if} + {$gContent->getField('metatags')} {/if} {/strip} |