Commit 032c70d0 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.26.3'

parents 8e976c0c 686a16cf
Pipeline #19655556 canceled with stages
in 6 minutes and 56 seconds
...@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface ...@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/** /**
* Contains the current ACP3 version string. * Contains the current ACP3 version string.
*/ */
const VERSION = '4.26.2'; const VERSION = '4.26.3';
/** /**
* Performs some startup checks. * Performs some startup checks.
......
{extends file="asset:`$LAYOUT`"} {extends file="asset:`$LAYOUT`"}
{block CONTENT} {block CONTENT}
<div class="well well-small"> <div class="well well-sm">
<h4>{lang t="acp|access_to_modules"}</h4> <h4>{lang t="acp|access_to_modules"}</h4>
<ul> <ul>
{foreach $modules as $module} {foreach $modules as $module}
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-seo": "Provides additional SEO capabilities" "acp3/module-seo": "Provides additional SEO capabilities"
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -4,17 +4,25 @@ ...@@ -4,17 +4,25 @@
*/ */
/* global onloadCallback:true */ /* global onloadCallback:true */
onloadCallback = function() { onloadCallback = function () {
jQuery('.recaptcha-placeholder').each(function() { jQuery('.recaptcha-placeholder').each(function () {
if (jQuery(this).children().length === 0) { if (jQuery(this).children().length === 0) {
grecaptcha.render(this.id, { var widgetId = grecaptcha.render(this.id, {
'sitekey': this.dataset.sitekey, 'sitekey': this.dataset.sitekey,
'size': this.dataset.size 'size': this.dataset.size
}); });
jQuery(this).data('recaptchaId', widgetId);
} }
}); });
}; };
jQuery(document).on('acp3.captcha.recaptcha', function() { jQuery(document).on('acp3.captcha.recaptcha', function () {
onloadCallback(); onloadCallback();
}); });
jQuery(document).on('acp3.ajaxFrom.submit.fail', function (event, ajaxForm) {
grecaptcha.reset(
jQuery(ajaxForm.element).find('.recaptcha-placeholder').data('recaptchaId')
);
});
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2", "acp3/module-users": "^4.26.3",
"google/recaptcha": "^1.1.0" "google/recaptcha": "^1.1.0"
}, },
"autoload": { "autoload": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2", "acp3/module-users": "^4.26.3",
"mibe/feedwriter": "^1.0" "mibe/feedwriter": "^1.0"
}, },
"autoload": { "autoload": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2", "acp3/module-users": "^4.26.3",
"acp3/module-categories": "^4.26.2" "acp3/module-categories": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-seo": "Provides additional SEO capabilities" "acp3/module-seo": "Provides additional SEO capabilities"
......
...@@ -69,12 +69,12 @@ class Edit extends AbstractFormAction ...@@ -69,12 +69,12 @@ class Edit extends AbstractFormAction
if (!empty($picture)) { if (!empty($picture)) {
$this->breadcrumb $this->breadcrumb
->append($picture['title'], 'acp/gallery/pictures/index/id_' . $picture['gallery_id']) ->append($picture['gallery_title'], 'acp/gallery/pictures/index/id_' . $picture['gallery_id'])
->append($this->translator->t('gallery', 'admin_pictures_edit')); ->append($this->translator->t('gallery', 'admin_pictures_edit'));
$this->title $this->title
->setPageTitlePrefix( ->setPageTitlePrefix(
$picture['title'] $picture['gallery_title']
. $this->title->getPageTitleSeparator() . $this->title->getPageTitleSeparator()
. $this->translator->t('gallery', 'picture_x', ['%picture%' => $picture['pic']]) . $this->translator->t('gallery', 'picture_x', ['%picture%' => $picture['pic']])
); );
......
...@@ -93,12 +93,14 @@ class GeneratePictureUriAliasOnModelAfterSaveListener ...@@ -93,12 +93,14 @@ class GeneratePictureUriAliasOnModelAfterSaveListener
\sprintf(Gallery\Helpers::URL_KEY_PATTERN_GALLERY, $galleryId) \sprintf(Gallery\Helpers::URL_KEY_PATTERN_GALLERY, $galleryId)
); );
$robotsSetting = array_flip($this->metaStatements->getRobotsMap());
$this->uriAliasManager->insertUriAlias( $this->uriAliasManager->insertUriAlias(
\sprintf(Gallery\Helpers::URL_KEY_PATTERN_PICTURE, $pictureId), \sprintf(Gallery\Helpers::URL_KEY_PATTERN_PICTURE, $pictureId),
$alias, $alias,
$seoKeywords, $seoKeywords,
$seoDescription, $seoDescription,
$seoRobots $robotsSetting[$seoRobots] ?? 0
); );
} }
} }
......
...@@ -58,8 +58,8 @@ services: ...@@ -58,8 +58,8 @@ services:
- '@gallery.helpers' - '@gallery.helpers'
- '@gallery.model.picturerepository' - '@gallery.model.picturerepository'
- '@gallery.cache' - '@gallery.cache'
calls: - '@?seo.helper.uri_alias_manager'
- ['setUriAliasManager', ['@?seo.helper.uri_alias_manager']] - '@?share.helpers.social_sharing_manager'
gallery.controller.admin.pictures.edit: gallery.controller.admin.pictures.edit:
class: ACP3\Modules\ACP3\Gallery\Controller\Admin\Pictures\Edit class: ACP3\Modules\ACP3\Gallery\Controller\Admin\Pictures\Edit
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-seo": "Provides additional SEO capabilities" "acp3/module-seo": "Provides additional SEO capabilities"
......
/*
* Copyright (c) by the ACP3 Developers.
* See the LICENSE file at the top-level module directory for licensing details.
*/
jQuery(document).ready(function ($) {
$('#modal-create').on('shown.bs.modal', function () {
$(this).find('[data-ajax-form="true"]').formSubmit();
});
});
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<p class="text-center"> <p class="text-center">
<a href="{uri args="guestbook/index/create"}" id="create-link" title="{lang t="guestbook|create"}" data-toggle="modal" data-target="#modal-create">{lang t="guestbook|create"}</a> <a href="{uri args="guestbook/index/create"}" id="create-link" title="{lang t="guestbook|create"}" data-toggle="modal" data-target="#modal-create">{lang t="guestbook|create"}</a>
</p> </p>
{javascripts}
{include_js module="guestbook" file="frontend/index.index"}
{/javascripts}
{else} {else}
<p class="text-center"> <p class="text-center">
<a href="{uri args="guestbook/index/create"}" id="create-link" title="{lang t="guestbook|create"}">{lang t="guestbook|create"}</a> <a href="{uri args="guestbook/index/create"}" id="create-link" title="{lang t="guestbook|create"}">{lang t="guestbook|create"}</a>
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2", "acp3/module-users": "^4.26.3",
"acp3/module-categories": "^4.26.2" "acp3/module-categories": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-seo": "Provides additional SEO capabilities" "acp3/module-seo": "Provides additional SEO capabilities"
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.26.2", "acp3/core": "^4.26.3",
"acp3/setup": "^4.26.2", "acp3/setup": "^4.26.3",
"acp3/module-errors": "^4.26.2", "acp3/module-errors": "^4.26.3",
"acp3/module-permissions": "^4.26.2", "acp3/module-permissions": "^4.26.3",
"acp3/module-system": "^4.26.2", "acp3/module-system": "^4.26.3",
"acp3/module-users": "^4.26.2" "acp3/module-users": "^4.26.3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
...@@ -63,6 +63,13 @@ class MetaStatements ...@@ -63,6 +63,13 @@ class MetaStatements
*/ */
private $isActive; private $isActive;
private static $robotSettingsMaps = [
1 => 'index,follow',
2 => 'index,nofollow',
3 => 'noindex,follow',
4 => 'noindex,nofollow',
];
/** /**
* MetaStatements constructor. * MetaStatements constructor.
* *
...@@ -91,7 +98,7 @@ class MetaStatements ...@@ -91,7 +98,7 @@ class MetaStatements
* *
* @return $this * @return $this
*/ */
public function setPageRobotsSettings($metaRobots) public function setPageRobotsSettings(string $metaRobots)
{ {
$this->metaRobots = $metaRobots; $this->metaRobots = $metaRobots;
...@@ -103,7 +110,7 @@ class MetaStatements ...@@ -103,7 +110,7 @@ class MetaStatements
* *
* @return array * @return array
*/ */
public function getMetaTags() public function getMetaTags(): array
{ {
if ($this->isActive) { if ($this->isActive) {
if (!$this->isInAdmin() && empty($this->canonicalUrl)) { if (!$this->isInAdmin() && empty($this->canonicalUrl)) {
...@@ -126,7 +133,7 @@ class MetaStatements ...@@ -126,7 +133,7 @@ class MetaStatements
/** /**