From 4bfa39155d7da74657cceb47b0df7ca0566888fd Mon Sep 17 00:00:00 2001
From: SirCotare <SirCotare@localhost>
Date: Mon, 25 Jun 2012 22:00:02 +0200
Subject: [PATCH] #1470 monday's push_all

---
 .../class/AdmDispatcher_inter.php                     | 11 -----------
 .../app_achievements_admin/class/AdmMenu_class.php    |  3 ++-
 .../app_achievements_admin/class/Dispatcher_trait.php |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 code/web/app/app_achievements_admin/class/AdmDispatcher_inter.php

diff --git a/code/web/app/app_achievements_admin/class/AdmDispatcher_inter.php b/code/web/app/app_achievements_admin/class/AdmDispatcher_inter.php
deleted file mode 100644
index 102b7c893..000000000
--- a/code/web/app/app_achievements_admin/class/AdmDispatcher_inter.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-	interface AdmDispatcher {
-		/*---------------------------
-			The admin dispatcher allows us to perform operations on child nodes.
-		---------------------------*/
-		function insertNode(&$n);
-		function removeNode($id);
-		function updateNode($id,$data);
-		function getNode($id);
-	}
-?>
\ No newline at end of file
diff --git a/code/web/app/app_achievements_admin/class/AdmMenu_class.php b/code/web/app/app_achievements_admin/class/AdmMenu_class.php
index 524f249d0..e259f5ba4 100644
--- a/code/web/app/app_achievements_admin/class/AdmMenu_class.php
+++ b/code/web/app/app_achievements_admin/class/AdmMenu_class.php
@@ -1,5 +1,6 @@
 <?php
-	class AdmMenu extends AchMenu implements AdmDispatcher {
+	class AdmMenu extends AchMenu {
+		use Dispatcher;
 		
 		function AdmMenu($open) {
 			parent::__construct($open);
diff --git a/code/web/app/app_achievements_admin/class/Dispatcher_trait.php b/code/web/app/app_achievements_admin/class/Dispatcher_trait.php
index 455c4453f..9e59eb0db 100644
--- a/code/web/app/app_achievements_admin/class/Dispatcher_trait.php
+++ b/code/web/app/app_achievements_admin/class/Dispatcher_trait.php
@@ -6,7 +6,7 @@
 			$this->nodes[] = $n;
 		}
 
-		function removeNode($id) {
+		function removeNode($id) {#NAMENSKONFLIKT!!
 			$res = $this->getNode($id);
 			if($res != null) {
 				$res->delete_me();