Fixing version check for 1.10

main/admin/index.php

@@ -300,6 +300,7 @@ if (api_is_platform_admin()) {
 }
 $admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 
+$app['template']->assign('web_admin_ajax_url', $admin_ajax_url);
 $app['template']->assign('blocks', $blocks);
 $app['template']->display('default/admin/settings_index.tpl');
 

main/inc/ajax/admin.ajax.php

@@ -5,7 +5,6 @@
  */
 
 require_once '../global.inc.php';
-require_once api_get_path(SYS_CODE_PATH).'admin/statistics/statistics.lib.php';
 
 api_protect_admin_script();
 
@@ -53,6 +52,7 @@ switch ($action) {
 
     case 'version':
         echo version_check();
+        exit;
         break;
 }
 
@@ -95,7 +95,7 @@ function version_check()
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (the modifications)
  * @author Yannick Warnier <ywarnier@beeznest.org> for the move to HTTP request
  * @copyright (C) 2001 The phpBB Group
- * @return language string with some layout (color)
+ * @return string language string with some layout (color)
  */
 function check_system_version()
 {
@@ -104,11 +104,11 @@ function check_system_version()
 
     if (ini_get('allow_url_fopen') == 1) {
         // The number of courses
-        $number_of_courses = statistics::count_courses();
+        $number_of_courses = Statistics::count_courses();
 
         // The number of users
-        $number_of_users = statistics::count_users();
-        $number_of_active_users = statistics::count_users(null,null,null,true);
+        $number_of_users = Statistics::count_users();
+        $number_of_active_users = Statistics::count_users(null, null, null, true);
 
         $data = array(
             'url' => api_get_path(WEB_PATH),

main/template/default/admin/settings_index.tpl

@@ -15,6 +15,7 @@ $(function() {
     <div class="row">
 
     {% for block_item in blocks %}
+
         {% if loop.index % 2 == 1 %}
             {% if app.full_width == 1 %}
                 <div class="row-fluid">
@@ -48,9 +49,11 @@ $(function() {
                 {% endif %}
             </div>
         </div>
+
         {% if loop.index % 2 == 0 %}
             </div>
         {% endif %}
     {% endfor %}
     </div>
+</div>
 {% endblock %}