5 files changed, 49 insertions, 4 deletions
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index 7a5030579..ee3773c7e 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -15,5 +15,5 @@
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/usersettings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p> 
+	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p> 
 </div>
 \ No newline at end of file
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index 973c4f7ce..6460dce16 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -13,5 +13,5 @@
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/usersettings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
+	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
 </div>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index 77d3340e3..ee767951c 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -13,5 +13,5 @@
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/usersettings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
+	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
 </div>
 \ No newline at end of file
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 730950178..580a81029 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -26,7 +26,7 @@
 		foreach ($installed_plugins as $plugin => $data)
 		{
 			if (($n>=$offset) && ($n < $offset+$limit))
-				echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
+				echo elgg_view("settings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
 			
 			$n++;
 		}
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
new file mode 100644
index 000000000..4fe218048
--- /dev/null
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -0,0 +1,45 @@
+<?php
+	/**
+	 * Elgg statistics screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	
+	// Get entity statistics
+	$entity_stats = get_entity_statistics($_SESSION['user']->guid);
+	
+	if ($entity_stats)
+	{
+?>
+<div>    
+    <h2><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h2>
+    <table>
+        <?php
+            foreach ($entity_stats as $k => $entry)
+            {
+                echo "<table>";
+                foreach ($entry as $a => $b)
+                {
+                    if ($a == "__base__") 
+                        $a=$k;
+                    else
+                        $a = "$k $a";
+                    echo <<< END
+                        <tr>
+                            <td><b>$a :</b></td>
+                            <td>$b</td>
+                        </tr>
+END;
+                }
+                echo "</table>";
+            }
+        ?>
+    </table>
+</div>
+<?php } ?>
+\ No newline at end of file