X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=edithelp.pl;h=d1975ba6707c9b61910a3da4de38546222d2caff;hb=132743f66bc07f6b8799835aac6cf440430bd44e;hp=5d236c2fd286a8eb53534ce34f2d382b6a00a64a;hpb=14658447ef9029046d3bb62c73e218212369d9e9;p=koha_fer

diff --git a/edithelp.pl b/edithelp.pl
index 5d236c2fd2..d1975ba670 100755
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -13,14 +13,15 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use C4::Output;
 use C4::Auth;
 use CGI;
+use warnings;
 
 use vars qw($debug);
 
@@ -30,10 +31,12 @@ BEGIN {
 
 our $input = new CGI;
 
-my $type    = $input->param('type');
-my $referer = $input->param('referer');
+my $type    = $input->param('type') || '';
+my $referer = $input->param('referer') || '';
 my $oldreferer = $referer;
-my $help    = $input->param('help');
+my $help    = $input->param('help') || '';
+# strip any DOS-newlines that TinyMCE may have sneaked in
+$help =~ s/\r//g;
 my $error;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(