| Property changes on: branches/REL1_15/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /trunk/phase3/includes/api:48813-48814,48819,48909,49051,49068,49086,49682,49775 |
| 2 | 2 | + /trunk/phase3/includes/api:48813-48814,48819,48836,48909,49051,49068,49086,49682,49775 |
| Property changes on: branches/REL1_15/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /trunk/phase3/includes/specials:48993,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials/specials:48993 |
| 4 | 4 | + /trunk/phase3/includes/specials:48836,48993,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials/specials:48993 |
| Property changes on: branches/REL1_15/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 5 | 5 | - /trunk/phase3/includes:49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials:48993 |
| 6 | 6 | + /trunk/phase3/includes:48836,49051,49068,49086,49682,49775 |
| /trunk/phase3/includes/specials:48993 |
| Index: branches/REL1_15/phase3/languages/LanguageConverter.php |
| — | — | @@ -981,7 +981,7 @@ |
| 982 | 982 | if ( in_array($variant, $flags) ) |
| 983 | 983 | $flags_temp[] = $variant; |
| 984 | 984 | } |
| 985 | | - if ( count($flags_temp) == 0 ) |
| | 985 | + if ( count($flags_temp) !== 0 ) |
| 986 | 986 | $flags = $flags_temp; |
| 987 | 987 | } |
| 988 | 988 | if ( count($flags) == 0 ) |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 989 | 989 | - /trunk/phase3:48814,48909,49051,49068,49086,49682,49775 |
| 990 | 990 | + /trunk/phase3:48814,48836,48909,49051,49068,49086,49682,49775 |