From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 1 Dec 2010 08:32:28 +0000 (+0000)
Subject: updated patch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af0be23b62e2e7f24d505fe008bbcedd234eed38;p=gosa.git

updated patch

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20457 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/redhat/04_fix_online_help_location.patch b/gosa-core/redhat/04_fix_online_help_location.patch
index 85f8ff6b3..97cd67c40 100644
--- a/gosa-core/redhat/04_fix_online_help_location.patch
+++ b/gosa-core/redhat/04_fix_online_help_location.patch
@@ -1,8 +1,8 @@
-diff -urNad gosa-core~/html/helpviewer.php gosa-core/html/helpviewer.php
---- gosa-core~/html/helpviewer.php	2008-04-12 19:58:14.000000000 +0200
-+++ gosa-core/html/helpviewer.php	2008-04-14 17:25:10.000000000 +0200
-@@ -110,7 +110,7 @@
- if(session::is_set('current_class_for_help')){
+diff -urNad -x .svn test/html/helpviewer.php gosa-core/html/helpviewer.php
+--- test/html/helpviewer.php	2010-12-01 10:34:21.513749000 +0100
++++ gosa-core/html/helpviewer.php	2010-12-01 10:32:41.017749002 +0100
+@@ -104,7 +104,7 @@
+ if(session::global_is_set('current_class_for_help')){
  
    /* Create new XML parser with the path to the Xml file */
 -  $xml = new parseXml("../doc/guide.xml");
@@ -10,10 +10,10 @@ diff -urNad gosa-core~/html/helpviewer.php gosa-core/html/helpviewer.php
    
    /* Generate help array */
    $str = $xml->parse();
-diff -urNad gosa-core~/update-gosa gosa-core/update-gosa
---- gosa-core~/update-gosa	2008-04-14 14:59:22.000000000 +0200
-+++ gosa-core/update-gosa	2008-04-14 17:24:53.000000000 +0200
-@@ -193,7 +193,7 @@
+diff -urNad -x .svn test/update-gosa gosa-core/update-gosa
+--- test/update-gosa	2010-12-01 10:34:21.545749001 +0100
++++ gosa-core/update-gosa	2010-12-01 10:32:41.020749000 +0100
+@@ -209,7 +209,7 @@
  
  function rescan_guide()
  {