Merge branch 'hotfix-1.0.1'

Author: andersbryrup

js/os2web_print_send_to_friend.js

@@ -5,13 +5,13 @@
 jQuery(document).ready(function($) {
   $(".throbber").hide();
   $("#send_to_friend_form").submit(function(e){
-    e.preventDefault;
+    e.preventDefault();
     var $form = $("#send_to_friend_form");
     serializedData = $form.serialize();
 
     var email = $("#field_send_to_friend_email").val();
     var id = $("#field_bullet_point_id").val();
-    var base_url = $("#field_base_url").val();
+    var base_url = $(this).find('input[name=base_url]').val();
 
     if (!checkEmail(email)){
      $("#field_send_to_friend_email").focus();
@@ -22,8 +22,8 @@ jQuery(document).ready(function($) {
       $("#field_send_to_friend_email").removeClass("error");
 
       $.post(base_url + "/dagsorden_punkt/"+ id +"/send_to_friend_service", serializedData, function(response){
-	$(".throbber").hide();
-	parent.Lightbox.end();
+        $(".throbber").hide();
+        parent.Lightbox.end();
       });
       return false;
     }

os2web_print_send_to_friend.module

@@ -128,7 +128,7 @@ function os2web_print_send_to_friend_send_to_friend($bullet_point_id) {
 
   $body .= os2web_print_send_to_friend_print_bullet_point($bullet_point_id);
 
-  $from = variable_get('system_mail');
+  $from = variable_get('site_mail');
   $message = array(
     'id' => 'send_to_friend_',
     'to' => $_POST['email'],