Skip to content

Commit

Permalink
Merge pull request #56 from jonathanheilmann/v1.3.0
Browse files Browse the repository at this point in the history
[RELEASE] Release of version 1.3.0
  • Loading branch information
jonathanheilmann authored Aug 21, 2017
2 parents 0629753 + 22e51f2 commit 7344f95
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 45 deletions.
20 changes: 15 additions & 5 deletions Classes/Service/OgRendererService.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,11 @@ public function main($content, $conf)
$content = '';
$og = array();

/* @var \TYPO3\CMS\Extbase\Object\ObjectManager */
$objectManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');

if ($this->signalSlotDispatcher == null)
{
/* @var \TYPO3\CMS\Extbase\Object\ObjectManager */
$objectManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
$this->signalSlotDispatcher = $objectManager->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
}

// 2013-04-22 [email protected]
// Check if the tt_news "displaySingle" method has been called before
Expand Down Expand Up @@ -140,7 +139,18 @@ public function main($content, $conf)
$og['image'] = $fileObjects;

// Get url
$og['url'] = htmlentities(GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
/** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
$cObj = $objectManager->get(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
$additionalParams = GeneralUtility::_GET();
if (GeneralUtility::_GP('L'))
$additionalParams['L'] = (int)GeneralUtility::_GP('L');
unset($additionalParams['id']);
$lConf = [
'additionalParams' => '&' . GeneralUtility::implodeArrayForUrl('', $additionalParams),
'parameter' => $GLOBALS['TSFE']->id
];
$og['url'] = htmlentities($cObj->typoLink_URL($lConf));


// Get site_name
$og['site_name'] = htmlspecialchars(!empty($conf['sitename']) ?
Expand Down
8 changes: 8 additions & 0 deletions Documentation/ChangeLog/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ ChangeLog
:Changes:
Changes

- :Version:
1.3.0

:Changes:
\* [TASK] #54 Compatibility with TYPO3 8

\* [BUGFIX] #51 Non realURL urls rendered/generated

- :Version:
1.2.6

Expand Down
4 changes: 2 additions & 2 deletions Documentation/Settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
conf.py:
copyright: 2012-2017
project: Open Graph protocol
version: 1.2
release: 1.2.6
version: 1.3
release: 1.3.0
intersphinx_mapping:
t3tsref:
- http://docs.typo3.org/typo3cms/TyposcriptReference/
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"support": {
"issues": "https://github.com/jonathanheilmann/ext-jh_opengraphprotocol/issues"
},
"version": "1.2.6",
"version": "1.3.0",
"require": {
"typo3/cms": "~6.2||~7.6"
"typo3/cms": "~6.2||~7.6||~8.7"
},
"replace": {
"jh_opengraphprotocol": "self.version",
Expand Down
63 changes: 27 additions & 36 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,38 @@
/***************************************************************
* Extension Manager/Repository config file for ext "jh_opengraphprotocol".
*
* Auto generated 29-12-2013 12:55
* Auto generated 27-07-2017 19:36
*
* Manual updates:
* Only the data in the array - everything else is removed by next
* writing. "version" and "dependencies" must not be touched!
***************************************************************/

$EM_CONF[$_EXTKEY] = array(
'title' => 'Open Graph protocol',
'description' => 'Adds the Open Graph protocol properties in meta-tags to the html-header supporting multilingual-websites.',
'category' => 'plugin',
'shy' => 0,
'version' => '1.2.6',
'dependencies' => '',
'conflicts' => '',
'priority' => '',
'loadOrder' => '',
'module' => '',
'state' => 'stable',
'uploadfolder' => 0,
'createDirs' => '',
'modify_tables' => '',
'clearcacheonload' => 1,
'lockType' => '',
'author' => 'Jonathan Heilmann',
'author_email' => '[email protected]',
'author_company' => '',
'CGLcompliance' => null,
'CGLcompliance_note' => null,
'constraints' =>
array(
'depends' =>
array(
'typo3' => '6.2.0-7.6.99',
),
'conflicts' =>
array(
'jh_opengraph_ttnews' => '0.0.0-0.0.10',
),
'suggests' =>
array(
),
$EM_CONF[$_EXTKEY] = array (
'title' => 'Open Graph protocol',
'description' => 'Adds the Open Graph protocol properties in meta-tags to the html-header supporting multilingual-websites.',
'category' => 'plugin',
'version' => '1.3.0',
'state' => 'stable',
'uploadfolder' => false,
'createDirs' => '',
'clearcacheonload' => true,
'author' => 'Jonathan Heilmann',
'author_email' => '[email protected]',
'author_company' => '',
'constraints' =>
array (
'depends' =>
array (
'typo3' => '6.2.0-8.7.99',
),
'conflicts' =>
array (
'jh_opengraph_ttnews' => '0.0.0-0.0.10',
),
'suggests' =>
array (
),
),
);

0 comments on commit 7344f95

Please sign in to comment.