rename getTalkPages to getNewMessageLinks, use wfmsghtml for seperator (brion)

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 4850fcc..beb30aa 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -270,7 +270,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('jsvarurl', false);
                }
-               $newtalks = $wgUser->getTalkPages();
+               $newtalks = $wgUser->getNewMessageLinks();
 
                if (count($newtalks) == 1 && $newtalks[0]["wiki"] === $wgDBname) {
                        $usertitle = $this->mUser->getUserPage();
@@ -291,7 +291,7 @@ class SkinTemplate extends Skin {
                                $wgOut->setSquidMaxage(0);
                        }
                } else if (count($newtalks)) {
-                       $sep = wfMsg("newtalkseperator");
+                       $sep = wfMsgHtml("newtalkseperator");
                        $msgs = array();
                        foreach ($newtalks as $newtalk) {
                                $msgs[] = wfElement("a", 

diff --git a/includes/User.php b/includes/User.php
index 9a58bc9..2024364 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -813,7 +813,7 @@ class User {
        /**
         * Return the talk page(s) this user has new messages on.
         */
-       function getTalkPages() {
+       function getNewMessageLinks() {
        global  $wgDBname;
                $talks = array();
                if (!wfRunHooks('UserRetrieveNewTalks', array(&$this, &$talks)))