From ec18bd788c3b0ef6870ff9a82c80ef620eb639e8 Mon Sep 17 00:00:00 2001 From: Tomas Kasparek Date: Wed, 8 Jul 2015 13:33:37 +0200 Subject: [PATCH] fix PHP Fatal error: Cannot redeclare class Generator on PHP 5.5 PHP 5.5 STL introdouced class Generator and PHP interpret thinks we want to redeclare it -> rename Generator class to something else --- Admin/Templates/village.tpl | 4 ++-- GameEngine/Generator.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index 5ba031c8..58ea571d 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -70,14 +70,14 @@ if(isset($id)) Gyh3S6m0a0Qszrnz6RnQWAAxV5tT/VAiNQAAAABJRU5ErkJggg=="; $refreshicon = ""; - class Generator + class MyGenerator { public function getMapCheck($wref) { return substr(md5($wref),5,2); } }; - $generator = new Generator; + $generator = new MyGenerator; if($village and $user) { diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php index 94f90425..296900c3 100644 --- a/GameEngine/Generator.php +++ b/GameEngine/Generator.php @@ -9,7 +9,7 @@ ## ## ################################################################################# -class Generator { +class MyGenerator { public function generateRandID(){ return md5($this->generateRandStr(16)); @@ -162,4 +162,4 @@ if (date('Ymd',time()) == date('Ymd',$time)) { } }; -$generator = new Generator; \ No newline at end of file +$generator = new MyGenerator;