Cleanup unused more-buttons.patch

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 737444aadc7d6a73cd467c2e1986a5ff3d247b3d..fda850b2ea58c1435eeb948dc1958d7c0b7c60b1 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -40,7 +40,6 @@ Patch8:               %{name}-notify-respect-minor.patch
 Patch10:       %{name}-mailtext.patch
 Patch19:       pld-branding.patch
 Patch21:       task-1821.patch
-Patch24:       more-buttons.patch
 Patch27:       iconsizes-dump.patch
 Patch28:       https://github.com/dokuwiki/dokuwiki/pull/2432.diff
 # Patch28-md5: 5afbddfdd2b5c3a72377ead41da555af
@@ -135,7 +134,6 @@ echo '====== PlayGround ======' >  data/pages/playground/playground.txt
 %patch10 -p1
 %patch19 -p1
 #%patch21 -p1
-#%patch24 -p1
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1

diff --git a/more-buttons.patch b/more-buttons.patch
deleted file mode 100644 (file)
index 7cebd34..0000000
--- a/more-buttons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php~       2015-08-11 15:39:31.799253674 +0300
-+++ dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php        2015-08-11 15:39:49.525658460 +0300
-@@ -66,6 +66,19 @@
-             </div>
-             <ul>
-                 <?php
-+                    global $REV;
-+                    if (!plugin_isdisabled('html2pdf') || !plugin_isdisabled('dw2pdf')) {
-+                        echo '<li>';
-+                        tpl_link(wl($ID, array('do' => 'export_pdf', 'rev' => $REV)), '<span>PDF Export</span>', 'class="action html2pdf"');
-+                        echo '</li>';
-+                    }
-+
-+                    if (!plugin_isdisabled('odt')) {
-+                        echo '<li>';
-+                        tpl_link(wl($ID, array('do' => 'export_odt', 'rev' => $REV)), '<span>ODT Export</span>', 'class="action odt"');
-+                        echo '</li>';
-+                    }
-+
-                     tpl_toolsevent('sitetools', array(
-                         tpl_action('recent', true, 'li', true),
-                         tpl_action('media', true, 'li', true),