From 532044e12653a3f1e9e422fea20e52ef8466a73f Mon Sep 17 00:00:00 2001
From: Isuru Abeywardana <vpisabeywardana@gmail.com>
Date: Wed, 6 Jan 2016 03:53:11 +0100
Subject: [PATCH 1/2] Translated using Weblate (Sinhala)

Currently translated at 60.5% (1943 of 3210 strings)

[CI skip]
---
 po/si.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/si.po b/po/si.po
index fb594eb9f1..bf6b3a8b0f 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.3-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-12-16 07:59+0100\n"
-"PO-Revision-Date: 2015-07-24 06:59+0200\n"
-"Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
-"Language-Team: Sinhala <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/si/>\n"
+"PO-Revision-Date: 2016-01-06 03:53+0000\n"
+"Last-Translator: Isuru Abeywardana <vpisabeywardana@gmail.com>\n"
+"Language-Team: Sinhala "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-5/si/>\n"
 "Language: si\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.4-dev\n"
+"X-Generator: Weblate 2.5-dev\n"
 
 #: changelog.php:37 license.php:30
 #, php-format
@@ -357,7 +357,7 @@ msgstr ""
 
 #: error_report.php:72
 msgid "Thank you for submitting this report."
-msgstr ""
+msgstr "මෙම වාර්තාව යොමුකලාට ස්තූතියි."
 
 #: error_report.php:76
 msgid ""

From 6de48ce8c180b426a5781e9388e49ce1a4ea51ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 7 Jan 2016 11:32:51 +0100
Subject: [PATCH 2/2] Fix creating/editing VIEW with DEFINER containing special
 chars
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #11826

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog       | 1 +
 view_create.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a17b23844b..07a11d3bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - issue #11798 Fix handling of databases with dot in a name
 - issue #11820 Fix hiding of page content behind menu
 - issue #11780 FROM clause not generated after loading search bookmark
+- issue #11826 Fix creating/editing VIEW with DEFINER containing special chars
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
diff --git a/view_create.php b/view_create.php
index 5ea2aa3364..3ec2ef7c50 100644
--- a/view_create.php
+++ b/view_create.php
@@ -58,7 +58,9 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     }
 
     if (! empty($_REQUEST['view']['definer'])) {
-        $sql_query .= $sep . ' DEFINER = ' . $_REQUEST['view']['definer'];
+        $arr = explode('@', $_REQUEST['view']['definer']);
+        $sql_query .= $sep . 'DEFINER=' . PMA_Util::backquote($arr[0]);
+        $sql_query .= '@' . PMA_Util::backquote($arr[1]) . ' ';
     }
 
     if (isset($_REQUEST['view']['sql_security'])) {