/[smeserver]/rpms/e-smith-horde/sme8/e-smith-horde-1.13.0-23.upgrade_to_horde317.patch
ViewVC logotype

Annotation of /rpms/e-smith-horde/sme8/e-smith-horde-1.13.0-23.upgrade_to_horde317.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (hide annotations) (download)
Thu Jun 26 04:27:31 2008 UTC (16 years ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
* Tue Jun 24 2008 John H. Bennett III <bennettj@johnbennettservices.com> 3.2-2
- Upgrade patch for Horde 3.2.1

1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header
2     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2008-03-16 21:26:38.000000000 -0500
3     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2008
4     -03-16 21:20:57.000000000 -0500
5     @@ -2,7 +2,7 @@
6     /**
7     * registry.php -- Horde application registry.
8     *
9     - * $Horde: horde/config/registry.php.dist,v 1.255.2.20 2007/03/29 23:02:48 jan Exp $
10     + * $Horde: horde/config/registry.php.dist,v 1.255.2.21 2007/10/11 00:28:54 jan Exp $
11     *
12     * This configuration file is used by Horde to determine which Horde
13     * applications are installed and where, as well as how they interact.
14     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoo
15     t mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot
16     --- e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot 2008-03-16 21:26:38.
17     000000000 -0500
18     +++ mezzanine_patched_e-smith-horde-1.13.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/800WebRoot 2008
19     -03-16 21:23:37.000000000 -0500
20     @@ -9,7 +9,11 @@
21     $_SERVER['SCRIPT_URL'];
22     $hordedir = str_replace(DIRECTORY_SEPARATOR, '/', __FILE__);
23     $hordedir = basename(preg_replace(';/config/registry.php$;', '', $hordedir));
24     - $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
25     + if (preg_match(';/' . $hordedir . ';', $path)) \{
26     + $webroot = preg_replace(';/' . $hordedir . '.*;', '/' . $hordedir, $path);
27     + \} else \{
28     + $webroot = '';
29     + \}
30     \} elseif (isset($_SERVER['PHP_SELF'])) \{
31     $webroot = preg_split(';/;', $_SERVER['PHP_SELF'], 2, PREG_SPLIT_NO_EMPTY);
32     $webroot = strstr(dirname(__FILE__), DIRECTORY_SEPARATOR . array_shift($webroot));
33    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed