noalyss-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 08/44: Merge branch 'master' of gitlab.noalys


From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 08/44: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss
Date: Wed, 26 Dec 2018 04:29:51 -0500 (EST)

sparkyx pushed a commit to branch master
in repository noalyss.

commit cfac3730570a4baba8891d08e11570d6c26ebc0f
Merge: 25be6b6 553a2d9
Author: Dany De Bontridder <address@hidden>
Date:   Fri Nov 9 17:58:39 2018 +0100

    Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss

 html/js/scripts.js                        |   3 +-
 include/ajax/ajax_anc_accounting.php      |   2 +
 include/class/fiche.class.php             |   5 +-
 include/constant.php                      |   3 +-
 include/sql/patch/upgrade129.sql          | 109 ++++++++++++++++++++++++++++++
 include/template/ledger_detail_bottom.php |   4 +-
 6 files changed, 119 insertions(+), 7 deletions(-)

diff --cc include/constant.php
index b595080,a9a55b6..d2657a2
--- a/include/constant.php
+++ b/include/constant.php
@@@ -62,10 -62,8 +62,9 @@@ if ( strpos($inc_path,";") != 0 ) 
    $os=1;                      /* $os is 1 for unix */
  }
  set_include_path($new_path);
 -ini_set ('default_charset',"UTF-8");
 -ini_set ('magic_quotes_gpc','off');
 address@hidden ('default_charset',"UTF-8");
 address@hidden ('session.use_cookies',1);
 address@hidden ('magic_quotes_gpc','off');
- @ini_set ('session.use_only_cookies','on');
  
  if ( ! defined('OVERRIDE_PARAM')) {
      ini_set ('max_execution_time',240);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]