diff --git a/lib/mail.php b/lib/mail.php index eaef2285b5..6c6450ab50 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -240,14 +240,13 @@ function mail_subscribe_notify_profile($listenee, $other) $headers['To'] = $name . ' <' . $listenee->email . '>'; // TRANS: Subject of new-subscriber notification e-mail. // TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename. - $headers['Subject'] = sprintf(_('%1$s is now listening to '. - 'your notices on %2$s.'), + $headers['Subject'] = sprintf(_('%1$s is now following you on %2$s.'), $other->getBestName(), common_config('site', 'name')); // TRANS: Main body of new-subscriber notification e-mail. // TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename. - $body = sprintf(_('%1$s is now listening to your notices on %2$s.'), + $body = sprintf(_('%1$s is now following you on %2$s.'), $long_name, common_config('site', 'name')) . mail_profile_block($other) . diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 196a262095..e149573e88 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -49,6 +49,7 @@ class MobileProfilePlugin extends WAP20Plugin { public $DTD = null; public $serveMobile = false; + public $reallyMobile = false; public $mobileFeatures = array(); function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd') @@ -160,6 +161,7 @@ class MobileProfilePlugin extends WAP20Plugin $this->setMobileFeatures($httpuseragent); $this->serveMobile = true; + $this->reallyMobile = true; break; } } @@ -201,21 +203,28 @@ class MobileProfilePlugin extends WAP20Plugin header('Content-Type: '.$type); - $action->extraHeaders(); - if (preg_match("/.*\/.*xml/", $type)) { - // Required for XML documents - $action->xw->startDocument('1.0', 'UTF-8'); - } - $action->xw->writeDTD('html', - '-//WAPFORUM//DTD XHTML Mobile 1.0//EN', - $this->DTD); + if ($this->reallyMobile) { - $language = $action->getLanguage(); + $action->extraHeaders(); + if (preg_match("/.*\/.*xml/", $type)) { + // Required for XML documents + $action->xw->startDocument('1.0', 'UTF-8'); + } + $action->xw->writeDTD('html', + '-//WAPFORUM//DTD XHTML Mobile 1.0//EN', + $this->DTD); - $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', + $language = $action->getLanguage(); + + $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => $language)); - return false; + return false; + + } else { + return true; + } + } function setMobileFeatures($useragent) diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php index 3d10c25b2c..5675eb5c2f 100644 --- a/plugins/Msn/extlib/phpmsnclass/msn.class.php +++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php @@ -2973,7 +2973,7 @@ X-OIM-Sequence-Num: 1 // t=tick&p= // binary secret // RST2: messenger.msn.com - // t=tick + // t=tick // RST3: contacts.msn.com // t=tick&p= // RST4: messengersecure.live.com @@ -2985,7 +2985,7 @@ X-OIM-Sequence-Num: 1 preg_match("#". "(.*)(.*)". "(.*)(.*)". - "(.*)(.*)". + "(.*)(.*)". "(.*)(.*)". "(.*)(.*)". "(.*)(.*)". diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 6ae14d2c7d..40656b7cf9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -418,10 +418,6 @@ address .poweredby { content: '\25B8'; } -.notice .addressees:empty:before { - content: none; -} - .fn { overflow: hidden; } diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index a1144b489b..c6ddbac654 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -99,12 +99,21 @@ line-height:auto; filter: alpha(opacity=0); } +.notice .addressees:before { + content: '\003E'; +} + /* IE7 */ *+html .input_forms { margin-bottom: -20px; } +*+html .notice .addressees { + background: url(../images/icons/arrow_right.png) no-repeat top left; + padding-left: 16px; +} + /* IE6 */ #content { diff --git a/theme/base/images/icons/arrow_right.png b/theme/base/images/icons/arrow_right.png new file mode 100644 index 0000000000..cefa7c2c7a Binary files /dev/null and b/theme/base/images/icons/arrow_right.png differ diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css index 0dabae74cd..578736810e 100644 --- a/theme/neo/css/mp-screen.css +++ b/theme/neo/css/mp-screen.css @@ -427,10 +427,6 @@ margin-left:0 !important; content: '\003E'; } -.notice .addressees:empty { - display: none; -} - .user_in .notice div.entry-content { max-width: 150px; }