mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-06 13:16:54 +02:00
Code Issues Releases Wiki Activity

Merge pull request #157 from promo360/master

Browse Source 
Promo360 - Fixes
This commit is contained in:
Sergey Romanenko
2013-11-21 04:46:24 -08:00
parent a5118781e2 9f8d7f5198
commit 74baf298c5
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
engine/Monstra.php
View File

@@ -179,6 +179,7 @@ class Monstra
ORM::configure(MONSTRA_DB_DSN); ORM::configure(MONSTRA_DB_DSN);
ORM::configure('username', MONSTRA_DB_USER); ORM::configure('username', MONSTRA_DB_USER);
ORM::configure('password', MONSTRA_DB_PASSWORD); ORM::configure('password', MONSTRA_DB_PASSWORD);
ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
} }
/** /**

8
libraries/Gelato/Image/Image.php
View File

@@ -218,6 +218,8 @@ class Image
// Create a new true color image width new width and height // Create a new true color image width new width and height
$resized = imagecreatetruecolor($new_width, $new_height); $resized = imagecreatetruecolor($new_width, $new_height);
$transPng = imagecolorallocatealpha($resized, 0, 0, 0, 127);
imagefill($resized, 0, 0, $transPng);
// Copy and resize part of an image with resampling // Copy and resize part of an image with resampling
imagecopyresampled($resized, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->width, $this->height); imagecopyresampled($resized, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->width, $this->height);
@@ -227,6 +229,8 @@ class Image
// Create a new true color image width new width and height // Create a new true color image width new width and height
$this->image = imagecreatetruecolor($new_width, $new_height); $this->image = imagecreatetruecolor($new_width, $new_height);
$transPng = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
imagefill($this->image, 0, 0, $transPng);
// Copy and resize part of an image with resampling // Copy and resize part of an image with resampling
imagecopyresampled($this->image, $resized, 0, 0, 0, 0, $new_width, $new_height, $new_width, $new_height); imagecopyresampled($this->image, $resized, 0, 0, 0, 0, $new_width, $new_height, $new_width, $new_height);
@@ -269,6 +273,8 @@ class Image
// Create a new true color image // Create a new true color image
$crop = imagecreatetruecolor($width, $height); $crop = imagecreatetruecolor($width, $height);
$transPng = imagecolorallocatealpha($crop, 0, 0, 0, 127);
imagefill($crop, 0, 0, $transPng);
// Copy and resize part of an image with resampling // Copy and resize part of an image with resampling
imagecopyresampled($crop, $this->image, 0, 0, $x, $y, $this->width, $this->height, $this->width, $this->height); imagecopyresampled($crop, $this->image, 0, 0, $x, $y, $this->width, $this->height, $this->width, $this->height);
@@ -278,6 +284,8 @@ class Image
// Create a new true color image // Create a new true color image
$this->image = imagecreatetruecolor($width, $height); $this->image = imagecreatetruecolor($width, $height);
$transPng = imagecolorallocatealpha($this->image, 0, 0, 0, 127);
imagefill($this->image, 0, 0, $transPng);
// Copy and resize part of an image with resampling // Copy and resize part of an image with resampling
imagecopyresampled($this->image, $crop, 0, 0, 0, 0, $width, $height, $width, $height); imagecopyresampled($this->image, $crop, 0, 0, 0, 0, $width, $height, $width, $height);

1
plugins/box/system/languages/en.lang.php
View File

@@ -76,5 +76,6 @@
'Main .htaccess file not writable' => 'Main .htaccess file not writable', 'Main .htaccess file not writable' => 'Main .htaccess file not writable',
'Official Support Forum' => 'Official Support Forum', 'Official Support Forum' => 'Official Support Forum',
'Documentation' => 'Documentation', 'Documentation' => 'Documentation',
'Your changes have been saved.' => 'Your changes have been saved.',
) )
); );

1
plugins/box/system/languages/ru.lang.php
View File

@@ -75,5 +75,6 @@
'Main .htaccess file not writable' => 'Главный .htaccess файл не доступен для записи', 'Main .htaccess file not writable' => 'Главный .htaccess файл не доступен для записи',
'Official Support Forum' => 'Официальный Форум Поддержки', 'Official Support Forum' => 'Официальный Форум Поддержки',
'Documentation' => 'Документация', 'Documentation' => 'Документация',
'Your changes have been saved.' => 'Ваши изменения сохранены.',
) )
); );