Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-13 7c2179f4b8604da1167b29ffb92041cf16fc4dbc

 server/lib/classes/cron.d/100-monitor_system_update.inc.php

@@ -53,6 +53,10 @@
   public function onRunJob() {
      global $app, $conf;

      $app->uses('getconf');
      $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
      if($server_config['monitor_system_updates'] == 'n') return;
		
      /* used for all monitor cronjobs */
      $app->load('monitor_tools');
      $this->_tools = new monitor_tools();