[eGroupWare-svn] r52657 - in /branches/14.2/egroupware: ./ doc/rpm-build/post_install.php

[<ral...@us...>]

Author: ralfbecker
Date: Wed Apr 29 15:41:28 2015
New Revision: 52657

URL: http://svn.stylite.de/viewvc/egroupware?rev=52657&view=rev
Log:
fixed notice in installation

Modified:
    branches/14.2/egroupware/   (props changed)
    branches/14.2/egroupware/doc/rpm-build/post_install.php   (contents, props changed)

Propchange: branches/14.2/egroupware/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 29 15:41:28 2015
@@ -1,1 +1,1 @@
-/trunk/egroupware:51376,51422,51689,51807,51812,51817,51832,51973,51988,52022,52048
+/trunk/egroupware:51376,51397,51422,51689,51807,51812,51817,51832,51973,51988,52022,52048,52135,52137,52360,52596,52656

Modified: branches/14.2/egroupware/doc/rpm-build/post_install.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/egroupware/doc/rpm-build/post_install.php?rev=52657&r1=52656&r2=52657&view=diff
==============================================================================
--- branches/14.2/egroupware/doc/rpm-build/post_install.php (original)
+++ branches/14.2/egroupware/doc/rpm-build/post_install.php Wed Apr 29 15:41:28 2015
@@ -69,7 +69,7 @@
 );
 
 // read language from LANG enviroment variable
-if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
+if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : (isset($_SERVER['LANG']) ? $_SERVER['LANG'] : null)))
 {
 	@list($lang,$nat) = preg_split('/[_.]/',$lang);
 	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))

Propchange: branches/14.2/egroupware/doc/rpm-build/post_install.php
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 29 15:41:28 2015
@@ -1,1 +1,1 @@
-/trunk/egroupware/doc/rpm-build/post_install.php:52135
+/trunk/egroupware/doc/rpm-build/post_install.php:52135,52656