https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114474

Revision: 114474
Author:   jeroendedauw
Date:     2012-03-24 07:25:44 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
set cache duration back to normal and fix number formatting

Modified Paths:
--------------
    trunk/extensions/EducationProgram/specials/SpecialEducationProgram.php

Modified: trunk/extensions/EducationProgram/specials/SpecialEducationProgram.php
===================================================================
--- trunk/extensions/EducationProgram/specials/SpecialEducationProgram.php      
2012-03-24 07:21:45 UTC (rev 114473)
+++ trunk/extensions/EducationProgram/specials/SpecialEducationProgram.php      
2012-03-24 07:25:44 UTC (rev 114474)
@@ -32,7 +32,7 @@
        public function execute( $subPage ) {
                parent::execute( $subPage );
 
-               $this->startCache( 1 );
+               $this->startCache( 3600 );
 
                $this->displayNavigation();
 
@@ -83,24 +83,28 @@
        protected function getSummaryInfo() {
                $data = array();
 
-               $lang = $this->getLanguage();
+               $data['org-count'] = EPOrgs::singleton()->count();
+               $data['course-count'] = EPCourses::singleton()->count();
+               $data['active-course-count'] = EPCourses::singleton()->count( 
EPCourses::getStatusConds( 'current' ) );
 
-               $data['org-count'] = $lang->formatNum( 
EPOrgs::singleton()->count() );
-               $data['course-count'] = $lang->formatNum( 
EPCourses::singleton()->count() );
-               $data['active-course-count'] = $lang->formatNum( 
EPCourses::singleton()->count( EPCourses::getStatusConds( 'current' ) ) );
-
                $data['student-count'] = $this->getRoleCount( EP_STUDENT );
 
                // What do you mean? "to much nesting"? :)
-               $data['current-student-count'] = $lang->formatNum( count( 
array_unique( call_user_func_array(
+               $data['current-student-count'] = count( array_unique( 
call_user_func_array(
                        'array_merge',
                        array_map( 'unserialize', 
EPCourses::singleton()->selectFields( 'students', EPCourses::getStatusConds( 
'current' ) ) )
-               ) ) ) );
+               ) ) );
 
                $data['instructor-count'] = $this->getRoleCount( EP_INSTRUCTOR 
);
                $data['oa-count'] = $this->getRoleCount( EP_OA );
                $data['ca-count'] = $this->getRoleCount( EP_CA );
 
+               $lang = $this->getLanguage();
+
+               foreach ( $data as &$number ) {
+                       $number = $lang->formatNum( $number );
+               }
+
                return $data;
        }
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to