diff --git a/include/enotify.php b/include/enotify.php index bed00c5eaf..4973bedc24 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -49,7 +49,7 @@ function notification($params) { // with $params['show_in_notification_page'] == false, the notification isn't inserted into // the database, and an email is sent if applicable. // default, if not specified: true - $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:True); + $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:true); $additional_mail_header = ""; $additional_mail_header .= "Precedence: list\n"; diff --git a/js/main.js b/js/main.js index 9f06a833e0..008d84b0bf 100644 --- a/js/main.js +++ b/js/main.js @@ -263,13 +263,13 @@ var html = notifications_tpl.format( e.attr('href'), // {0} // link to the source e.attr('photo'), // {1} // photo of the contact - text, // {2} // preformatet text (autor + text) + text, // {2} // preformatted text (autor + text) e.attr('date'), // {3} // date of notification (time ago) - seenclass, // {4} // vistiting status of the notification - new Date(e.attr('timestamp')*1000), // {5} //date of notification + seenclass, // {4} // visited status of the notification + new Date(e.attr('timestamp')*1000), // {5} // date of notification e.attr('url'), // {6} // profile url of the contact - e.text().format(""), // {7} // clean status text - contact // {8} //preformatat author (name + profile url) + e.text().format(contact), // {7} // preformatted html (text including author profile url) + '' // {8} // Deprecated ); nnm.append(html); }); diff --git a/mod/register.php b/mod/register.php index 6fc5887ef5..0d29b3f9e5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -132,7 +132,6 @@ function register_post(&$a) { $admin_mail_list ); - foreach ($adminlist as $admin) { notification(array( 'type' => NOTIFY_SYSTEM, @@ -145,11 +144,11 @@ function register_post(&$a) { 'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg", 'to_email' => $admin['email'], 'uid' => $admin['uid'], - 'language' => ($admin['language']?$admin['language']:'en')) - ); + 'language' => ($admin['language']?$admin['language']:'en'), + 'show_in_notification_page' => false + )); } - info( t('Your registration is pending approval by the site owner.') . EOL ) ; goaway(z_root());