diff --git a/lib/classes/patch/383alpha2a.php b/lib/classes/patch/383alpha2a.php new file mode 100644 index 0000000000..26edbd7594 --- /dev/null +++ b/lib/classes/patch/383alpha2a.php @@ -0,0 +1,68 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $appbox, Application $app) + { + // Clean validation sessions where initiator_id does not exist anymore + $sql = 'SELECT DISTINCT(v.id) AS validation_session_id FROM `ValidationSessions` v LEFT JOIN usr u ON (v.initiator_id = u.usr_id) WHERE u.usr_id IS NULL'; + $stmt = $appbox->get_connection()->prepare($sql); + $stmt->execute(); + $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); + $stmt->closeCursor(); + + foreach ($rows as $row) { + if (null !== $vsession = $app['EM']->find('Entities\ValidationSession', $row['validation_session_id'])) { + $app['EM']->remove($vsession); + } + } + + $app['EM']->flush(); + + return true; + } +} diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index e001ef6ac1..366abf90cd 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -116,21 +116,21 @@
-
-
- diff --git a/templates/web/admin/collection/suggested_value.html.twig b/templates/web/admin/collection/suggested_value.html.twig index b0abd38b42..1de85e1a27 100644 --- a/templates/web/admin/collection/suggested_value.html.twig +++ b/templates/web/admin/collection/suggested_value.html.twig @@ -809,7 +809,7 @@ pref["{{ value['key']|escapeDoubleQuote|raw }}"].valsug["{{ value['value']|escap function getSruct() { - var dom = document.implementation.createDocument(null, 'baseprefs'); + var dom = document.implementation.createDocument(null, 'baseprefs', null); var values = dom.createElement('sugestedValues'); for (a in pref ) { diff --git a/templates/web/admin/databox/databox.html.twig b/templates/web/admin/databox/databox.html.twig index 5a2857c554..00910ccf2f 100644 --- a/templates/web/admin/databox/databox.html.twig +++ b/templates/web/admin/databox/databox.html.twig @@ -139,7 +139,7 @@
- diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index b1217b656c..711765e89c 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -108,7 +108,7 @@ {% if has_terms_of_use %}
  • {% block tou_link %} - {{ "Terms of use" | trans }} + {{ "Terms of use" | trans }} {% endblock tou_link %}
  • {% endif %} diff --git a/www/skins/login/less/skin.less b/www/skins/login/less/skin.less index 205aa2d726..fd32830027 100644 --- a/www/skins/login/less/skin.less +++ b/www/skins/login/less/skin.less @@ -878,7 +878,7 @@ form[name=registerForm] .multiselect-group { #authentication-sidebar-language { position: absolute; top: 0; - left: 0; + left: 20px; right: 20px; } diff --git a/www/skins/prod/Push.css b/www/skins/prod/Push.css index 81d7734c5c..79482bf53c 100644 --- a/www/skins/prod/Push.css +++ b/www/skins/prod/Push.css @@ -258,7 +258,7 @@ .ui-autocomplete li.list-item { width:280px; - height:45px; + min-height:45px; display:block; }