From 627fc03f93cc74f443af98f4fbf25564cc24d3fc Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Tue, 30 Jul 2013 11:10:34 +0200
Subject: Fix for the FS#1833 parser error

---
 inc/parser/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 915899f53..6aef3fda5 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -454,8 +454,8 @@ class Doku_Parser_Mode_table extends Doku_Parser_Mode {
     }
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('\n\^',$mode,'table');
-        $this->Lexer->addEntryPattern('\n\|',$mode,'table');
+        $this->Lexer->addEntryPattern('\s*\n\^',$mode,'table');
+        $this->Lexer->addEntryPattern('\s*\n\|',$mode,'table');
     }
 
     function postConnect() {
-- 
cgit v1.2.3


From fc498a423a295d14127239e3838b6fb7bb0c8529 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Tue, 30 Jul 2013 18:48:02 +0200
Subject: FS#2770 - prevent <file> and <code> syntax regex matching token names
 which start '<file' or '<code'

---
 inc/parser/parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 6aef3fda5..4af1cd333 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -555,7 +555,7 @@ class Doku_Parser_Mode_preformatted extends Doku_Parser_Mode {
 class Doku_Parser_Mode_code extends Doku_Parser_Mode {
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('<code(?=.*</code>)',$mode,'code');
+        $this->Lexer->addEntryPattern('<code\b(?=.*</code>)',$mode,'code');
     }
 
     function postConnect() {
@@ -571,7 +571,7 @@ class Doku_Parser_Mode_code extends Doku_Parser_Mode {
 class Doku_Parser_Mode_file extends Doku_Parser_Mode {
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('<file(?=.*</file>)',$mode,'file');
+        $this->Lexer->addEntryPattern('<file\b(?=.*</file>)',$mode,'file');
     }
 
     function postConnect() {
-- 
cgit v1.2.3


From e5d09fddcd17a2fe896650b64b81313a7d000975 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Wed, 31 Jul 2013 17:30:08 +0200
Subject: Index media file usage in the metadata index and use it in
 ft_mediause()

---
 inc/parser/metadata.php | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index e17b82f8b..d64fe4d77 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -282,8 +282,10 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   function internallink($id, $name = NULL){
     global $ID;
 
-    if(is_array($name))
+    if(is_array($name)) {
         $this->_firstimage($name['src']);
+        if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+    }
 
     $default = $this->_simpleTitle($id);
 
@@ -304,8 +306,10 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function externallink($url, $name = NULL){
-    if(is_array($name))
+    if(is_array($name)) {
         $this->_firstimage($name['src']);
+        if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+    }
 
     if ($this->capture){
       $this->doc .= $this->_getLinkTitle($name, '<' . $url . '>');
@@ -313,8 +317,10 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function interwikilink($match, $name = NULL, $wikiName, $wikiUri){
-    if(is_array($name))
+    if(is_array($name)) {
         $this->_firstimage($name['src']);
+        if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+    }
 
     if ($this->capture){
       list($wikiUri, $hash) = explode('#', $wikiUri, 2);
@@ -324,8 +330,10 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function windowssharelink($url, $name = NULL){
-    if(is_array($name))
+    if(is_array($name)) {
         $this->_firstimage($name['src']);
+        if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+    }
 
     if ($this->capture){
       if ($name) $this->doc .= $name;
@@ -334,8 +342,10 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function emaillink($address, $name = NULL){
-    if(is_array($name))
+    if(is_array($name)) {
         $this->_firstimage($name['src']);
+        if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+    }
 
     if ($this->capture){
       if ($name) $this->doc .= $name;
@@ -347,6 +357,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
                          $height=NULL, $cache=NULL, $linking=NULL){
     if ($this->capture && $title) $this->doc .= '['.$title.']';
     $this->_firstimage($src);
+    $this->_recordMediaUsage($src);
   }
 
   function externalmedia($src, $title=NULL, $align=NULL, $width=NULL,
@@ -439,6 +450,15 @@ class Doku_Renderer_metadata extends Doku_Renderer {
         $this->firstimage = $src;
     }
   }
+
+  function _recordMediaUsage($src) {
+      global $ID;
+
+      list ($src, $hash) = explode('#', $src, 2);
+      if (media_isexternal($src)) return;
+      resolve_mediaid(getNS($ID), $src, $exists);
+      $this->meta['relation']['media'][$src] = $exists;
+  }
 }
 
 //Setup VIM: ex: et ts=4 :
-- 
cgit v1.2.3