sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 04:23:01 +00:00
Code Activity

fixed fatal login bug

Browse source
This commit is contained in:
Starbeamrainbowlabs 2015-05-26 17:54:46 +01:00
parent a0d4fecc1e
commit 173987512e
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core.php
View file

@ -256,7 +256,7 @@ class page_renderer
if($isloggedin) if($isloggedin)
{ {
$result .= "\t\t\tLogged in as " . render_username($user) . ". "; $result .= "\t\t\tLogged in as " . self::render_username($user) . ". ";
$result .= "<a href='index.php?action=logout'>Logout</a>. | \n"; $result .= "<a href='index.php?action=logout'>Logout</a>. | \n";
} }
else else
@ -355,6 +355,11 @@ class Slimdown {
'/\r\n/' => "\n", // new line normalisation '/\r\n/' => "\n", // new line normalisation
'/(#+)(.*)/' => 'self::header', // headers '/(#+)(.*)/' => 'self::header', // headers
'/(\*)(.*?)\1/' => '<strong>\2</strong>', // bold '/(\*)(.*?)\1/' => '<strong>\2</strong>', // bold
// todo test these
'/!\[(.*)\]\((.*)\)/' => '<img src="\2" alt="\1" />', // basic images
// todo end
'/(_)(.*?)\1/' => '<em>\2</em>', // emphasis '/(_)(.*?)\1/' => '<em>\2</em>', // emphasis
'/\[\[([a-zA-Z0-9\_\- ]+)\|([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\2</a>', //internal links with display text '/\[\[([a-zA-Z0-9\_\- ]+)\|([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\2</a>', //internal links with display text
'/\[\[([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\1</a>', //internal links '/\[\[([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\1</a>', //internal links

7
index.php
View file

@ -410,7 +410,7 @@ class page_renderer
if($isloggedin) if($isloggedin)
{ {
$result .= "\t\t\tLogged in as " . render_username($user) . ". "; $result .= "\t\t\tLogged in as " . self::render_username($user) . ". ";
$result .= "<a href='index.php?action=logout'>Logout</a>. | \n"; $result .= "<a href='index.php?action=logout'>Logout</a>. | \n";
} }
else else
@ -509,6 +509,11 @@ class Slimdown {
'/\r\n/' => "\n", // new line normalisation '/\r\n/' => "\n", // new line normalisation
'/(#+)(.*)/' => 'self::header', // headers '/(#+)(.*)/' => 'self::header', // headers
'/(\*)(.*?)\1/' => '<strong>\2</strong>', // bold '/(\*)(.*?)\1/' => '<strong>\2</strong>', // bold
// todo test these
'/!\[(.*)\]\((.*)\)/' => '<img src="\2" alt="\1" />', // basic images
// todo end
'/(_)(.*?)\1/' => '<em>\2</em>', // emphasis '/(_)(.*?)\1/' => '<em>\2</em>', // emphasis
'/\[\[([a-zA-Z0-9\_\- ]+)\|([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\2</a>', //internal links with display text '/\[\[([a-zA-Z0-9\_\- ]+)\|([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\2</a>', //internal links with display text
'/\[\[([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\1</a>', //internal links '/\[\[([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\1</a>', //internal links