uses adldap 4.0.4 internally

[packages/dokuwiki.git] / task-1821.patch

diff --git a/task-1821.patch b/task-1821.patch
index b66a894edb0806cefe54222b91cc7be24b012bbf..f7c7eba83f5fa9c36638780ef638158942c07d43 100644 (file)
--- a/task-1821.patch
+++ b/task-1821.patch
@@ -1,35 +1,68 @@
---- dokuwiki/inc/html.php~     2010-01-11 14:35:04.000000000 +0200
-+++ dokuwiki/inc/html.php      2010-01-11 14:35:07.213389784 +0200
-@@ -862,8 +862,12 @@
-     // given as rev and rev2 parameters, with rev2 being optional. Or in an
-     // array in rev2.
+adds: @DIFFPAGE@ placeholder to templates
+
+TODO:
+use rev1, rev2
+http://wintersunset.delfi.lan/dokuwiki/googledrawing?do=diff&rev1=1345291381&rev2=&difftype=sidebyside
+
+--- dokuwiki-2014-05-06/inc/html.php   2014-05-08 11:27:02.548232655 +0300
++++ dokuwiki-2014-05-06/inc/html.php   2014-05-08 11:27:02.548232655 +0300
+@@ -1134,7 +1134,13 @@
      $rev1 = $REV;
-+      // handle $r1 + $r2, see DW #1821
-+      if (isset($_REQUEST['r1']) && isset($_REQUEST['r2'])) {
-+        $rev1 = (int) $_REQUEST['r1'];
-+        $rev2 = (int) $_REQUEST['r2'];
  
--    if(is_array($_REQUEST['rev2'])){
-+      } else if(is_array($_REQUEST['rev2'])){
-         $rev1 = (int) $_REQUEST['rev2'][0];
-         $rev2 = (int) $_REQUEST['rev2'][1];
+     $rev2 = $INPUT->ref('rev2');
+-    if(is_array($rev2)) {
++
++    // handle $r1 + $r2, see DW #1821
++    if ($INPUT->has('r1') && $INPUT->has('r2')) {
++        $rev1 = $INPUT->int('r1');
++        $rev2 = $INPUT->int('r2');
++
++    } elseif(is_array($rev2)){
+         $rev1 = (int) $rev2[0];
+         $rev2 = (int) $rev2[1];
  
---- dokuwiki-rc2010-10-07/inc/common.php~      2010-10-07 21:41:20.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/common.php       2010-10-07 21:45:00.639114275 +0300
-@@ -1147,6 +1147,8 @@
-     }elseif($rev){
-         $subject = $lang['mail_changed'].' '.$id;
-         $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
-+        $rev2 = $INFO['meta']['date']['modified'];
-+        $text = str_replace('@DIFFPAGE@',wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&'),$text);
-         $df  = new Diff(explode("\n",rawWiki($id,$rev)),
-                         explode("\n",rawWiki($id)));
-         $dformat = new UnifiedDiffFormatter();
-@@ -1154,6 +1156,7 @@
-     }else{
-         $subject=$lang['mail_newpage'].' '.$id;
-         $text = str_replace('@OLDPAGE@','none',$text);
-+        $text = str_replace('@DIFFPAGE@','none',$text);
-         $diff = rawWiki($id);
+@@ -1458,8 +1464,8 @@
+     } else {
+         $urlparam = array(
+             'do' => 'diff',
+-            'rev2[0]' => $lrev,
+-            'rev2[1]' => $rrev,
++            'r1' => $lrev,
++            'r2' => $rrev,
+             'difftype' => $difftype,
+         );
      }
-     $text = str_replace('@DIFF@',$diff,$text);
+--- dokuwiki/inc/subscription.php      2013-05-29 22:02:46.801329978 +0300
++++ dokuwiki/inc/subscription.php      2013-05-29 23:04:29.374883349 +0300
+@@ -384,12 +384,13 @@
+      * @return bool                     true if successfully sent
+      */
+     public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
+-        global $DIFF_INLINESTYLES;
++        global $DIFF_INLINESTYLES, $INFO;
+ 
+         // prepare replacements (keys not set in hrep will be taken from trep)
++        $rev2 = $INFO['meta']['date']['modified'];
+         $trep = array(
+             'PAGE' => $id,
+-            'NEWPAGE' => wl($id, '', true, '&'),
++            'NEWPAGE' => wl($id, "rev=$rev2", true, '&'),
+             'SUMMARY' => $summary,
+             'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
+         );
+@@ -398,6 +399,7 @@
+         if($rev) {
+             $subject = 'changed';
+             $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
++            $trep['DIFFPAGE']= wl($id,"do=diff&r1=$rev&r2=$rev2",true,'&');
+ 
+             $old_content = rawWiki($id, $rev);
+             $new_content = rawWiki($id);
+@@ -417,6 +419,7 @@
+         } else {
+             $subject = 'newpage';
+             $trep['OLDPAGE'] = '---';
++            $trep['DIFFPAGE']= '---';
+             $tdiff = rawWiki($id);
+             $hdiff = nl2br(hsc($tdiff));
+         }