summaryrefslogtreecommitdiffstats
path: root/php-horde-Horde-Autoloader-Sabre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-horde-Horde-Autoloader-Sabre.patch')
-rw-r--r--php-horde-Horde-Autoloader-Sabre.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/php-horde-Horde-Autoloader-Sabre.patch b/php-horde-Horde-Autoloader-Sabre.patch
new file mode 100644
index 0000000..1bfe9ae
--- /dev/null
+++ b/php-horde-Horde-Autoloader-Sabre.patch
@@ -0,0 +1,22 @@
+diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php
+--- Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old 2014-01-03 15:51:31.000000000 +0100
++++ Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php 2014-01-03 15:51:48.000000000 +0100
+@@ -13,6 +13,7 @@
+ require_once 'Horde/Autoloader.php';
+ require_once 'Horde/Autoloader/ClassPathMapper.php';
+ require_once 'Horde/Autoloader/ClassPathMapper/Default.php';
++require_once 'Horde/Autoloader/ClassPathMapper/Prefix.php';
+
+ class Horde_Autoloader_Default extends Horde_Autoloader
+ {
+@@ -25,6 +26,10 @@ class Horde_Autoloader_Default extends H
+ $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path));
+ }
+ }
++ /* Ensure Sabre is taken from /usr/share/php, as /usr/share/pear may contains old version */
++ if (is_dir($sabre = '/usr/share/php/Sabre')) {
++ $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\/', $sabre));
++ }
+ }
+ }
+