mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
This commit is contained in:
bzick
2013-07-22 18:33:55 +04:00
parent c4610a7778 ce8f0201cc
commit 67e7ea0b9e
5 changed files with 84 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Fenom.php
View File

@@ -742,12 +742,12 @@ class Fenom {
* @throws \RuntimeException if key from custom assoc doesn't exists into possible values
*/
private static function _makeMask(array $values, array $options, $mask = 0) {
foreach($values as $value) {
if(isset($options[$value])) {
if($options[$value]) {
$mask |= $options[$value];
foreach ($values as $key=>$value) {
if (isset($options[$key])) {
if ($options[$key]) {
$mask |= $options[$key];
} else {
$mask &= ~$options[$value];
$mask &= ~$options[$key];
}
} else {
throw new \RuntimeException("Undefined parameter $value");