Skip to content
Snippets Groups Projects
Commit 0a6ae52f authored by Michael Hamann's avatar Michael Hamann
Browse files

Initialize more variables and test if others are set (no functional changes)

parent 3e8e3ae6
No related branches found
No related tags found
No related merge requests found
...@@ -103,6 +103,7 @@ function p_wiki_xhtml($id, $rev='', $excuse=true){ ...@@ -103,6 +103,7 @@ function p_wiki_xhtml($id, $rev='', $excuse=true){
function p_wiki_xhtml_summary($id, &$title, $rev='', $excuse=true){ function p_wiki_xhtml_summary($id, &$title, $rev='', $excuse=true){
$file = wikiFN($id,$rev); $file = wikiFN($id,$rev);
$ret = ''; $ret = '';
$ins = null;
//ensure $id is in global $ID (needed for parsing) //ensure $id is in global $ID (needed for parsing)
global $ID; global $ID;
...@@ -712,7 +713,7 @@ function & p_get_renderer($mode) { ...@@ -712,7 +713,7 @@ function & p_get_renderer($mode) {
$Renderer =& $plugin_controller->load('renderer',$rname); $Renderer =& $plugin_controller->load('renderer',$rname);
} }
if(is_null($Renderer)){ if(!isset($Renderer) || is_null($Renderer)){
msg("No renderer '$rname' found for mode '$mode'",-1); msg("No renderer '$rname' found for mode '$mode'",-1);
return null; return null;
} }
......
...@@ -217,6 +217,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { ...@@ -217,6 +217,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
global $conf; // definitely don't invoke "global $lang" global $conf; // definitely don't invoke "global $lang"
$path = DOKU_PLUGIN.$this->getPluginName().'/lang/'; $path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
$lang = array();
// don't include once, in case several plugin components require the same language file // don't include once, in case several plugin components require the same language file
@include($path.'en/lang.php'); @include($path.'en/lang.php');
if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment