hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix strict standards

Browse Source
This commit is contained in:
Romain Neutron
2012-09-25 13:20:28 +02:00
parent 553c2f5813
commit 85c7d07d9d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/classes/base.class.php
View File

@@ -446,7 +446,8 @@ abstract class base implements cache_cacheableInterface
$collation = trim((string) $field->collation) != '' ? trim((string) $field->collation) : 'utf8_unicode_ci';
$code = array_pop(array_reverse(explode('_', $collation)));
$collations = array_reverse(explode('_', $collation));
$code = array_pop($collations);
$character_set = ' CHARACTER SET ' . $code . ' COLLATE ' . $collation;
}
@@ -565,7 +566,8 @@ abstract class base implements cache_cacheableInterface
if (in_array(strtolower((string) $field->type), array('text', 'longtext', 'mediumtext', 'tinytext'))
|| substr(strtolower((string) $field->type), 0, 7) == 'varchar'
|| in_array(substr(strtolower((string) $field->type), 0, 4), array('char', 'enum'))) {
$code = array_pop(array_reverse(explode('_', $collation)));
$collations = array_reverse(explode('_', $collation));
$code = array_pop($collations);
$collation = ' CHARACTER SET ' . $code . ' COLLATE ' . $collation;
@@ -793,7 +795,8 @@ abstract class base implements cache_cacheableInterface
if (substr($fileinfo->getFilename(), 0, 1) == '.')
continue;
$classname = 'patch_' . array_pop(array_reverse(explode('.', $fileinfo->getFilename())));
$versions = array_reverse(explode('.', $fileinfo->getFilename()));
$classname = 'patch_' . array_pop($versions);
$patch = new $classname();