← Back to branch summary

~ubuntu-branches/ubuntu/quantal/dokuwiki/quantal

« back to all changes in this revision

Viewing changes to debian/patches/use_packaged_php-geshi_SA32559.diff

  • Committer: Package Import Robot
  • Author(s): Tanguy Ortolo
  • Date: 2012-01-26 23:10:28 UTC
  • mfrom: (1.1.14) (19.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120126231028-gdcxrxo3j4jqp2de
Tags: 0.0.20120125-1
* New upstream release.
* debian/patches/debianize.diff: updated for the new release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use_packaged_php-geshi_SA32559.diff
1
1
Author: Mohammed Adnène Trojette <adn+deb@diwi.org>
2
2
Description: Use packaged version of GeSHi instead of an embedded one
3
3
Bug-Debian: http://bugs.debian.org/513869
 
4
Forwarded: not-needed
 
5
Last-Update: 2012-01-02
4
6
 
5
7
Index: dokuwiki/inc/parserutils.php
6
8
===================================================================
7
 
--- dokuwiki.orig/inc/parserutils.php   2010-11-10 21:00:35.000000000 +0100
8
 
+++ dokuwiki/inc/parserutils.php        2010-11-10 21:02:39.650026651 +0100
9
 
@@ -634,14 +634,14 @@
 
9
--- dokuwiki.orig/inc/parserutils.php   2012-01-02 00:19:39.024832605 +0100
 
10
+++ dokuwiki/inc/parserutils.php        2012-01-02 00:19:43.448864619 +0100
 
11
@@ -748,14 +748,14 @@
10
12
     $cache = getCacheName($language.$code,".code");
11
13
     $ctime = @filemtime($cache);
12
14
     if($ctime && !$_REQUEST['purge'] &&
26
28
         $geshi->set_header_type(GESHI_HEADER_PRE);
27
29
Index: dokuwiki/inc/load.php
28
30
===================================================================
29
 
--- dokuwiki.orig/inc/load.php  2010-11-10 21:03:26.606031700 +0100
30
 
+++ dokuwiki/inc/load.php       2010-11-10 21:03:42.258026380 +0100
 
31
--- dokuwiki.orig/inc/load.php  2012-01-02 00:19:42.220855735 +0100
 
32
+++ dokuwiki/inc/load.php       2012-01-02 00:19:43.448864619 +0100
31
33
@@ -68,7 +68,7 @@
32
34
         'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
33
35
         'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',