11 files changed, 2 insertions, 38 deletions
diff --git a/views/opendd/canvas/default.php b/views/opendd/canvas/default.php
deleted file mode 100644
index 0cfa8b49a..000000000
--- a/views/opendd/canvas/default.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-for ($i = 1; $i < 8; $i++) {
-	if (isset($vars["area{$i}"])) {
-		echo $vars["area{$i}"];
-	}
-}
-\ No newline at end of file
diff --git a/views/opendd/export/entity.php b/views/opendd/export/entity.php
index f564ef32a..aaaf6bb8d 100644
--- a/views/opendd/export/entity.php
+++ b/views/opendd/export/entity.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $entity = $vars['entity'];
diff --git a/views/opendd/export/metadata.php b/views/opendd/export/metadata.php
index 146f7742e..03a8e2b42 100644
--- a/views/opendd/export/metadata.php
+++ b/views/opendd/export/metadata.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $m = $vars['metadata'];
diff --git a/views/opendd/export/relationship.php b/views/opendd/export/relationship.php
index 7cac7b0dd..f4ab779c4 100644
--- a/views/opendd/export/relationship.php
+++ b/views/opendd/export/relationship.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $r = $vars['relationship'];
diff --git a/views/opendd/group/default.php b/views/opendd/group/default.php
index b5913689a..6f6fc2b37 100644
--- a/views/opendd/group/default.php
+++ b/views/opendd/group/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $serialised = exportAsArray($vars['entity']->guid);
diff --git a/views/opendd/messages/exceptions/exception.php b/views/opendd/messages/exceptions/exception.php
index 0c932f4e5..dc0f48a8d 100644
--- a/views/opendd/messages/exceptions/exception.php
+++ b/views/opendd/messages/exceptions/exception.php
@@ -5,17 +5,14 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An exception
  */
 
-global $CONFIG;
 ?>
 <!--
-<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
-<?php if (isset($CONFIG->debug)) { ?>
+<?php echo get_class($vars['object']); ?>: <?php echo elgg_autop($vars['object']->getMessage()); ?>
+<?php if (elgg_get_config('debug')) { ?>
 <?php
 	echo print_r($vars['object'], true);
 ?>
diff --git a/views/opendd/object/default.php b/views/opendd/object/default.php
index b5913689a..6f6fc2b37 100644
--- a/views/opendd/object/default.php
+++ b/views/opendd/object/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $serialised = exportAsArray($vars['entity']->guid);
diff --git a/views/opendd/pageshells/pageshell.php b/views/opendd/page/default.php
index 617302dbf..bdd59d45e 100644
--- a/views/opendd/pageshells/pageshell.php
+++ b/views/opendd/page/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/opendd/search/entity_list.php b/views/opendd/search/entity_list.php
index 40b7cc840..6b33cefde 100644
--- a/views/opendd/search/entity_list.php
+++ b/views/opendd/search/entity_list.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 $entities = $vars['entities'];
 if (is_array($entities) && sizeof($entities) > 0) {
diff --git a/views/opendd/site/default.php b/views/opendd/site/default.php
index 0ce66193b..83f39eb67 100644
--- a/views/opendd/site/default.php
+++ b/views/opendd/site/default.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $serialised = exportAsArray($vars['entity']->guid);
diff --git a/views/opendd/user/default.php b/views/opendd/user/default.php
index b5913689a..6f6fc2b37 100644
--- a/views/opendd/user/default.php
+++ b/views/opendd/user/default.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $serialised = exportAsArray($vars['entity']->guid);