From 01863a5ff9721bb6346cae85fdf6984f2d1b8992 Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Thu, 18 Oct 2012 12:51:16 +0000
Subject: [PATCH] Merged from 5.1: a few fixes

---
 src/plugins/mediawiki/www/plugin_admin.php | 1 +
 src/www/admin/index.php                    | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/mediawiki/www/plugin_admin.php b/src/plugins/mediawiki/www/plugin_admin.php
index 0c6f26e92d..4f4406d4cc 100644
--- a/src/plugins/mediawiki/www/plugin_admin.php
+++ b/src/plugins/mediawiki/www/plugin_admin.php
@@ -177,6 +177,7 @@ echo "</div>\n\n";
  style="border:solid 1px black; margin:3px; padding:3px;"
  action="<?php echo getStringFromServer('PHP_SELF')."?group_id=$gid"; ?>">
 <h4><?php echo _("Upload a new logo") ?></h4>
+<p><?php echo _('The logo must be in PNG format and precisely 135x135 pixels in size.'); ?></p>
 <span class="important">
  <?php echo _('NOTE: In some browsers you must select the file in the file-upload dialog and click "OK".  Double-clicking doesn\'t register the file.')?>)
 </span>
diff --git a/src/www/admin/index.php b/src/www/admin/index.php
index 74c9570470..d2e0668f74 100644
--- a/src/www/admin/index.php
+++ b/src/www/admin/index.php
@@ -32,6 +32,7 @@
 
 require_once('../env.inc.php');
 require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/FusionForge.class.php';
 require_once $gfwww.'admin/admin_utils.php';
 require_once $gfwww.'include/role_utils.php';
 
@@ -44,11 +45,9 @@ $abc_array = array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','
 <h2><?php echo _('User Maintenance'); ?></h2>
 	<ul>
 	<li><?php
-		$res=db_query_params ('SELECT count(*) AS count FROM users WHERE status=$1',
-			array('A')) ;
-
-		$row = db_fetch_array($res);
-		printf(_('Active site users: <strong>%1$s</strong>'), $row['count']);
+		$gforge = new FusionForge();
+		printf(_('Active site users: <strong>%d</strong>'),
+		    $gforge->getNumberOfActiveUsers());
 	?></li>
 </ul>
 <ul>
-- 
2.30.2