| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2274,7 +2274,7 @@ |
| 2275 | 2275 | */ |
| 2276 | 2276 | function wfEmptyMsg( $key ) { |
| 2277 | 2277 | global $wgMessageCache; |
| 2278 | | - return $wgMessageCache->get( $key ) === false; |
| | 2278 | + return $wgMessageCache->get( $key, /*useDB*/true, /*content*/false ) === false; |
| 2279 | 2279 | } |
| 2280 | 2280 | |
| 2281 | 2281 | /** |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1704,14 +1704,16 @@ |
| 1705 | 1705 | } |
| 1706 | 1706 | } |
| 1707 | 1707 | |
| | 1708 | + /** |
| | 1709 | + * Give a chance for site and per-namespace customizations of |
| | 1710 | + * terms of service summary link that might exist separately |
| | 1711 | + * from the copyright notice. |
| | 1712 | + * |
| | 1713 | + * This will display between the save button and the edit tools, |
| | 1714 | + * so should remain short! |
| | 1715 | + */ |
| 1708 | 1716 | protected function showTosSummary() { |
| 1709 | 1717 | $msg = 'editpage-tos-summary'; |
| 1710 | | - // Give a chance for site and per-namespace customizations of |
| 1711 | | - // terms of service summary link that might exist separately |
| 1712 | | - // from the copyright notice. |
| 1713 | | - // |
| 1714 | | - // This will display between the save button and the edit tools, |
| 1715 | | - // so should remain short! |
| 1716 | 1718 | wfRunHooks( 'EditPageTosSummary', array( $this->mTitle, &$msg ) ); |
| 1717 | 1719 | $text = wfMsg( $msg ); |
| 1718 | 1720 | if( !wfEmptyMsg( $msg, $text ) && $text !== '-' ) { |