From 35d60274aba91da0abae83a97768a6cf761fcda5 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 17 Apr 2015 16:47:47 +0200
Subject: glpi 0.85.3

---
 glpi-0.85-cron.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'glpi-0.85-cron.patch')

diff --git a/glpi-0.85-cron.patch b/glpi-0.85-cron.patch
index 9ea752c..a84650c 100644
--- a/glpi-0.85-cron.patch
+++ b/glpi-0.85-cron.patch
@@ -1,13 +1,12 @@
 diff -up install/install.php.rpm install/install.php
 --- install/install.php.rpm	2014-12-17 13:36:22.420558338 +0100
 +++ install/install.php	2014-12-17 13:38:45.278209044 +0100
-@@ -345,6 +345,11 @@ function step4 ($databasename, $newdatab
+@@ -347,6 +347,10 @@ function step4 ($databasename, $newdatab
        $query = "UPDATE `glpi_users`
                  SET `language` = NULL";
        $DB->queryOrDie($query, "4203");
 +
 +      // RPM provides a good system cron
-+      Config::setConfigurationValues('core', array('cron_limit' => '6'));
 +      $query = "UPDATE `glpi_crontasks` SET `mode`=2 WHERE `name`!='watcher' AND (`allowmode` & 2)";
 +      $DB->queryOrDie($query, "4203");
     }
@@ -16,7 +15,7 @@ diff -up install/install.php.rpm install/install.php
 diff -up install/update.php.rpm install/update.php
 --- install/update.php.rpm	2014-12-11 14:16:55.000000000 +0100
 +++ install/update.php	2014-12-17 13:36:22.420558338 +0100
-@@ -803,6 +803,10 @@ function updateDbUpTo031() {
+@@ -808,6 +808,10 @@ function updateDbUpTo031() {
     $plugin = new Plugin();
     $plugin->unactivateAll();
  
-- 
cgit