From 4f7ae485b3acb7f7eef339188f705d33ce0e7b21 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Tue, 16 Aug 2016 23:42:28 +0200
Subject: [PATCH] php7 fixes (charset)

---
 inside/includes.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inside/includes.php b/inside/includes.php
index 6cb0cca..e6b6652 100644
--- a/inside/includes.php
+++ b/inside/includes.php
@@ -7,6 +7,10 @@ if (!isset($_SESSION['tinyMCE']['theme'])){
 }
 ini_set('display_errors', 1);
 
+// Override utf-8, which is default in php 5.6+
+// FIXME: remove?
+ini_set('default_charset','');
+
 $locale = Array('no_NO', 'nor_nor');
 setlocale(LC_TIME, $locale);
 
@@ -16,7 +20,7 @@ require_once "language.php";
 //Migration (nikolark)
 require_once "migration/ldap_api_functions.php";
 
-$path = "./includes".PATH_SEPARATOR."./includes/payex2".PATH_SEPARATOR."../includes";
+$path = "./includes".PATH_SEPARATOR."../includes";
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 
 $include_path = "./includes/";