From a083aea01c6f85781b2f25af72f4e7f890aeead1 Mon Sep 17 00:00:00 2001
From: "Mark (ilosuna)" <mail at mark-hoschek dot de>
Date: Sun, 24 Nov 2013 12:22:34 +0100
Subject: [PATCH] modification for php 5.5 (preg_replace /e modifier
 deprecated)

---
 cms/data/content.sqlite        | Bin 393216 -> 393216 bytes
 cms/includes/functions.inc.php |  21 ++++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index eba20400fc16e9c08783ab9cf837d493515f4c6f..ea94131251d751b821c51b8068a1c29279457e0c 100644
GIT binary patch
delta 441
zcmZo@kZ5R-m>|ulHBrWyRf|FQk!EAc))dCM|GDeh7?`Rf7^)*`u5WDg%iTEPA1`lH
z4Ldi3Iwy;AOEgE|_Q`cjQH;~)pI~L3&UcEHjn^<YzbI8ftthduG~asr^%|!2j4TWc
zj8z*O%NVycFfldQNihVJPi3vmuC1$`P_JBmx$Z;t+?tDZv9)_^UesIHF0SXRTVDIB
z@_8Lg6-V8ky8c>)I?c+G>KC;a>%*!(PIX|GwXUpAskW`wsyb2izkF)t>Z<KkE2<_{
zwNzzQ#a0DW8CFJDI#<e9{HnNDaj;@p#e|Cbip+|j`a@NB>q@rHU=}WCH8RmNG}^wQ
zoH>h;waSBmm0`M6C3EQXl1k<)9935tI2eFnx<?hW$@G>g=0J|>P^i$=DrURs($&mX
z{51y|_(7_mV0vgZv*q@=)yyi40<{qg0x)q9J^f$}v;MSN<_O_BPX=LR8IWW|Epw2F
z5Erw$U|wo@aeP5)QG7vSda9wp^u4vr*V>oYF>ha9$MW(M`^2;69{IVc({*Z?b+;cW
IWVPu70ROy}?f?J)

delta 436
zcmZo@kZ5R-m>|t4H&Mo!RgOXTk$Pjw))dCM|G60$7?^6VGt{-!T;JH}m%DKSGapM`
z8)Nmx#xln3*K3&8Gx9c-vvV`3bFwJ6M02=rPpxK(VieXdNK8-FHO$Q~N>xxRN-QkR
zx8Byk#MEGy&k#^Pm9;jaHoLaAUb*~o-G}PAH3#cF>n7LSsJE`2P|sJly!Kk<^V$zp
z9Cdr@s%sVML@P_GU)1ic5371P)qz>oI;%Rg+O}G&>O|G|@~M@ptF~9IsG3yOQk7H{
zTIEq?SQ%DnS1DETtKwe8!HQ)S6DsN}GAn}W4^>^QOV~PtS-70l&`i(JWc!A4<}AkP
z@|Db?tW`A(tPImjDw(fL52#``;iwj7-~f7@VR}mybKvy5Rm^rA)qPMQ>1t-H=_%FB
zmi#pz82CY|pkVvlYGxJ2=@)C5^#y8IF$loKLG-j*=7{Opwah`nb*2o$$TC3o^ozC3
z*Mx<*nAHXIQp=0u3sQ^XLBVI(zO0UU`?5NgSD)D1i?luRb5p15)G+IAKT^nQ(+2=^
C6qIuS

diff --git a/cms/includes/functions.inc.php b/cms/includes/functions.inc.php
index ba84ece..01bafad 100644
--- a/cms/includes/functions.inc.php
+++ b/cms/includes/functions.inc.php
@@ -603,6 +603,13 @@ function make_link($string)
   return $string;
  }
 
+function create_link_callback($string)
+ {
+  if(isset($string[2])) $link = '<a href="'.$string[1].'">'.$string[2].'</a>';
+  else $link = '<a href="'.$string[1].'">'.$string[1].'</a>';
+  return $link;
+ }
+
 function parse_special_tags($string, $parent_page=false, $rss=false)
  {
   global $settings;
@@ -619,22 +626,10 @@ function parse_special_tags($string, $parent_page=false, $rss=false)
     $string = preg_replace_callback("#\[thumbnail:(.+?)\]#is", "create_thumbnail", $string);
     $string = preg_replace_callback("#\[gallery:(.+?)\]#is", "create_gallery", $string);
    }
-  $string = preg_replace('/\[\[([^|\]]+?)(?:\|([^\]]+))?\]\]/e', "'<a href=\"\$1\">'.(('\$2')?'\$2':'\$1').'</a>'", $string); 
+  $string = preg_replace_callback('/\[\[([^|\]]+?)(?:\|([^\]]+))?\]\]/', "create_link_callback", $string); 
   return $string;
  }
 
-/*
-function make_link($string)
- {
-  $string = ' ' . $string;
-  $string = preg_replace("#(^|[\n ])([\w]+?://.*?[^ \"\n\r\t<]*)#is", "\\1<a href=\"\\2\">\\2</a>", $string);
-  $string = preg_replace("#(^|[\n ])((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\t\n\r<]*)?)#is", "\\1<a href=\"http://\\2\">\\2</a>", $string);
-  $string = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $string);
-  $string = substr($string, 1);
-  return $string;
- }
-*/
-
 function smilies($string)
  {
   global $settings;