[Fmsystem-commits] [16502] preparing for php7.1

[sigurdne]

Revision: 16502
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16502
Author:   sigurdne
Date:     2017-03-30 10:29:49 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
preparing for php7.1

Modified Paths:
--------------
    trunk/header.inc.php.template

Modified: trunk/header.inc.php.template
===================================================================
--- trunk/header.inc.php.template       2017-03-30 14:26:46 UTC (rev 16501)
+++ trunk/header.inc.php.template       2017-03-30 14:29:49 UTC (rev 16502)
@@ -173,19 +173,12 @@
 
        /**
        * @global string $phpgw_info['server']['setup_mcrypt_key']
-       * This is a random string used as the encryption key for mcrypt
+       * This is a random string used as the encryption key for mcrypt or 
libsodium
        * feel free to change it when setting up phpgroupware on a clean 
database,
        * but you must not change it after that point!
        */
        $GLOBALS['phpgw_info']['server']['setup_mcrypt_key'] = 
'{SETUP_MCRYPT_KEY}';
 
-       /**
-       * @global string $phpgw_info['server']['setup_libsodium_key']
-       * This is a random string used as the encryption key for libsodium
-       * Never change it!
-       */
-       $GLOBALS['phpgw_info']['server']['setup_libsodium_key'] = 
'{SETUP_LIBSODIUM_KEY}';
-
        /*
                This ensures IE gets the right character set
        */