opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

suppress errors where list() may not fill all vars

This commit is contained in:
Christopher Smith 2014-03-05 22:01:20 +00:00
parent 0e80bb5e34
commit 6d2af55dde
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/common.php
View File

@ -773,7 +773,7 @@ function checklock($id) {
}
//my own lock
list($ip, $session) = explode("\n", io_readFile($lock));
@list($ip, $session) = explode("\n", io_readFile($lock));
if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) {
return false;
}
@ -811,7 +811,7 @@ function lock($id) {
function unlock($id) {
$lock = wikiLockFN($id);
if(@file_exists($lock)) {
list($ip, $session) = explode("\n", io_readFile($lock));
@list($ip, $session) = explode("\n", io_readFile($lock));
if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) {
@unlink($lock);
return true;
@ -1536,7 +1536,7 @@ function send_redirect($url) {
// work around IE bug
// http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/
list($url, $hash) = explode('#', $url);
@list($url, $hash) = explode('#', $url);
if($hash) {
if(strpos($url, '?')) {
$url = $url.'&#'.$hash;

2
inc/parser/metadata.php
View File

@ -299,7 +299,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
// first resolve and clean up the $id
resolve_pageid(getNS($ID), $id, $exists);
list($page, $hash) = explode('#', $id, 2);
@list($page, $hash) = explode('#', $id, 2);
// set metadata
$this->meta['relation']['references'][$page] = $exists;

6
inc/parser/renderer.php
View File

@ -274,8 +274,8 @@ class Doku_Renderer extends DokuWiki_Plugin {
function _simpleTitle($name){
global $conf;
//if there is a hash we use the ancor name only
list($name,$hash) = explode('#',$name,2);
//if there is a hash we use the anchor name only
@list($name,$hash) = explode('#',$name,2);
if($hash) return $hash;
if($conf['useslash']){
@ -301,7 +301,7 @@ class Doku_Renderer extends DokuWiki_Plugin {
}
//split into hash and url part
list($reference,$hash) = explode('#',$reference,2);
@list($reference,$hash) = explode('#',$reference,2);
//replace placeholder
if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){

2
inc/parser/xhtml.php
View File

@ -606,7 +606,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
//keep hash anchor
list($id,$hash) = explode('#',$id,2);
@list($id,$hash) = explode('#',$id,2);
if(!empty($hash)) $hash = $this->_headerToLink($hash);
//prepare for formating