RetailCRM-Mirror/legacy
1
0
Fork 0
mirror of https://github.com/retailcrm/legacy.git synced 2024-11-22 21:36:02 +03:00
Code Issues Projects Releases Wiki Activity

fix after upstream merge

Browse Source
This commit is contained in:
Alex Lushpai 2016-03-15 13:02:31 +03:00
commit f21576b2c2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retailcrm/src/Components/Container.php
View File

@ -59,6 +59,7 @@ class Container
); );
$this->db->exec("set names utf8"); $this->db->exec("set names utf8");
$this->db->exec("set global group_concat_max_len = 1000000");
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING); $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
} catch (PDOException $e) { } catch (PDOException $e) {
CommandHelper::activateNotice('database'); CommandHelper::activateNotice('database');

2
retailcrm/src/Vendor/Fetch/Server.php vendored
View File

@ -380,7 +380,7 @@ class Server
public function getMessageByUid($uid) public function getMessageByUid($uid)
{ {
try { try {
$message = new Fetch\Message($uid, $this); $message = new Message($uid, $this);
return $message; return $message;
} catch (\Exception $e) { } catch (\Exception $e) {