| Index: branches/wmf/1.18wmf1/includes/OutputPage.php |
| — | — | @@ -1596,7 +1596,7 @@ |
| 1597 | 1597 | $this->mVaryHeader[$header] = $option; |
| 1598 | 1598 | } |
| 1599 | 1599 | } |
| 1600 | | - $this->mVaryHeader[$header] = array_unique( $this->mVaryHeader[$header] ); |
| | 1600 | + $this->mVaryHeader[$header] = array_unique( (array)$this->mVaryHeader[$header] ); |
| 1601 | 1601 | } |
| 1602 | 1602 | |
| 1603 | 1603 | /** |
| Property changes on: branches/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1604 | 1604 | Merged /trunk/phase3/includes/OutputPage.php:r101376 |