Revert "Merge branch 'dev' into master"

This reverts commit 18b89e8c35, reversing
changes made to 81132e9ccf.
This commit is contained in:
Yigit Kerem Oktay
2020-11-05 16:51:43 +03:00
parent 18b89e8c35
commit 46c0b55779
37 changed files with 118 additions and 5673 deletions
+7 -6
View File
@@ -18,13 +18,14 @@
// Contributors:
// Vojtěch Sajdl - Yigit Kerem Oktay - Thomas Nilsen - jhuesser
/**************************************************************************************/
session_start();
//Start editing here
//define("NAME", "##name##"); //Website name
//define("TITLE", "##title##");
//define("WEB_URL", "##url##"); //Used for links
//define("MAILER_NAME", "##mailer##"); //Mailer name
//define("MAILER_ADDRESS", "##mailer_email##"); //Mailer address
define("NAME", "##name##"); //Website name
define("TITLE", "##title##");
define("WEB_URL", "##url##"); //Used for links
define("MAILER_NAME", "##mailer##"); //Mailer name
define("MAILER_ADDRESS", "##mailer_email##"); //Mailer address
define("POLICY_NAME", "##policy_name##"); //name for contact in policy
define("ADDRESS", "##address##");
define("POLICY_MAIL", "##policy_mail##"); //contact email in policy
@@ -55,7 +56,7 @@ putenv('LANGUAGE='.$_SESSION['locale'].'.UTF-8');
setlocale(LC_ALL, $_SESSION['locale'].".UTF-8");
setlocale(LC_MESSAGES, $_SESSION['locale'].".UTF-8");
bindtextdomain("server-status", __DIR__ . "/locale/");
bind_textdomain_codeset("server-status", "utf-8");
bind_textdomain_codeset("server-status", "utf-8");
textdomain("server-status");
//Database connection