Skip to content

Commit

Permalink
Initialize more variables and test if others are set (no functional c…
Browse files Browse the repository at this point in the history
…hanges)
  • Loading branch information
michitux committed Jul 28, 2012
1 parent 3e8e3ae commit 0a6ae52
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion inc/parserutils.php
Expand Up @@ -103,6 +103,7 @@ function p_wiki_xhtml($id, $rev='', $excuse=true){
function p_wiki_xhtml_summary($id, &$title, $rev='', $excuse=true){
$file = wikiFN($id,$rev);
$ret = '';
$ins = null;

//ensure $id is in global $ID (needed for parsing)
global $ID;
Expand Down Expand Up @@ -712,7 +713,7 @@ function & p_get_renderer($mode) {
$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);
return null;
}
Expand Down
1 change: 1 addition & 0 deletions lib/plugins/syntax.php
Expand Up @@ -217,6 +217,7 @@ function setupLocale() {
global $conf; // definitely don't invoke "global $lang"
$path = DOKU_PLUGIN.$this->getPluginName().'/lang/';

$lang = array();
// don't include once, in case several plugin components require the same language file
@include($path.'en/lang.php');
if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
Expand Down

0 comments on commit 0a6ae52

Please sign in to comment.