summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-03-11 20:56:28 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-03-11 20:56:28 +0900
commit84819f2d57be609590ebd656232c4dae167fddde (patch)
tree5dabd13e68627b04e58731ac806b093c6ba82dbe
parent946ef22d57af0e77310c1114998078c8002a7e17 (diff)
php warnings - fix up more of them to keep err logs empty
-rw-r--r--public_html/lib/plugins/clear/syntax.php4
-rw-r--r--public_html/lib/plugins/gitbacked/action/editcommit.php2
-rw-r--r--public_html/lib/plugins/html5video/syntax/video.php4
-rw-r--r--public_html/lib/plugins/itemtable/syntax.php4
4 files changed, 7 insertions, 7 deletions
diff --git a/public_html/lib/plugins/clear/syntax.php b/public_html/lib/plugins/clear/syntax.php
index f1de38dd..60a75003 100644
--- a/public_html/lib/plugins/clear/syntax.php
+++ b/public_html/lib/plugins/clear/syntax.php
@@ -27,8 +27,8 @@ class syntax_plugin_clear extends DokuWiki_Syntax_Plugin {
27 function connectTo($mode) { 27 function connectTo($mode) {
28 $this->Lexer->addSpecialPattern('<clear/>',$mode,'plugin_clear'); 28 $this->Lexer->addSpecialPattern('<clear/>',$mode,'plugin_clear');
29 } 29 }
30 function handle($match, $state, $pos, $handler){ return array($match, $state, $pos); } 30 function handle($match, $state, $pos, Doku_Handler $handler){ return array($match, $state, $pos); }
31 function render($mode, $renderer, $data) { 31 function render($mode, Doku_Renderer $renderer, $data) {
32 if($mode == 'xhtml'){ 32 if($mode == 'xhtml'){
33 $renderer->doc .= "<div style='clear:both;'></div>"; 33 $renderer->doc .= "<div style='clear:both;'></div>";
34 return true; 34 return true;
diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php b/public_html/lib/plugins/gitbacked/action/editcommit.php
index 0094bf4e..9fcfb306 100644
--- a/public_html/lib/plugins/gitbacked/action/editcommit.php
+++ b/public_html/lib/plugins/gitbacked/action/editcommit.php
@@ -24,7 +24,7 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin {
24 io_mkdir_p($this->temp_dir); 24 io_mkdir_p($this->temp_dir);
25 } 25 }
26 26
27 public function register(Doku_Event_Handler &$controller) { 27 public function register(Doku_Event_Handler $controller) {
28 28
29 $controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this, 'handle_io_wikipage_write'); 29 $controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this, 'handle_io_wikipage_write');
30 $controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this, 'handle_media_upload'); 30 $controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this, 'handle_media_upload');
diff --git a/public_html/lib/plugins/html5video/syntax/video.php b/public_html/lib/plugins/html5video/syntax/video.php
index 22803893..78c7f0db 100644
--- a/public_html/lib/plugins/html5video/syntax/video.php
+++ b/public_html/lib/plugins/html5video/syntax/video.php
@@ -43,7 +43,7 @@ class syntax_plugin_html5video_video extends DokuWiki_Syntax_Plugin {
43 $this->Lexer->addSpecialPattern('\{\{[^}]*(?:(?:webm)|(?:ogv)|(?:mp4))(?:\|(?:\d{2,4}x\d{2,4})?(?:\|(?:loop)?,?(?:autoplay)?(?:,loop)?)?)? ?\}\}',$mode,'plugin_html5video_video'); 43 $this->Lexer->addSpecialPattern('\{\{[^}]*(?:(?:webm)|(?:ogv)|(?:mp4))(?:\|(?:\d{2,4}x\d{2,4})?(?:\|(?:loop)?,?(?:autoplay)?(?:,loop)?)?)? ?\}\}',$mode,'plugin_html5video_video');
44 } 44 }
45 45
46 public function handle($match, $state, $pos, $handler){ 46 public function handle($match, $state, $pos, Doku_Handler $handler){
47 $params = substr($match, strlen('{{'), - strlen('}}')); //Strip markup 47 $params = substr($match, strlen('{{'), - strlen('}}')); //Strip markup
48 if(strpos($params, ' ') === 0) { // Space as first character 48 if(strpos($params, ' ') === 0) { // Space as first character
49 if(substr_compare($params, ' ', -1, 1) === 0) { // Space a front and back = centered 49 if(substr_compare($params, ' ', -1, 1) === 0) { // Space a front and back = centered
@@ -65,7 +65,7 @@ class syntax_plugin_html5video_video extends DokuWiki_Syntax_Plugin {
65 return array(state, explode('|', $params)); 65 return array(state, explode('|', $params));
66 } 66 }
67 67
68 public function render($mode, $renderer, $data) { 68 public function render($mode, Doku_Renderer $renderer, $data) {
69 if($mode != 'xhtml') return false; 69 if($mode != 'xhtml') return false;
70 70
71 list($state, $params) = $data; 71 list($state, $params) = $data;
diff --git a/public_html/lib/plugins/itemtable/syntax.php b/public_html/lib/plugins/itemtable/syntax.php
index a07981fe..fa704753 100644
--- a/public_html/lib/plugins/itemtable/syntax.php
+++ b/public_html/lib/plugins/itemtable/syntax.php
@@ -47,7 +47,7 @@ class syntax_plugin_itemtable extends DokuWiki_Syntax_Plugin {
47 /** 47 /**
48 * Handle the match 48 * Handle the match
49 */ 49 */
50 function handle($match, $state, $pos, $handler){ 50 function handle($match, $state, $pos, Doku_Handler $handler){
51 switch ($state) { 51 switch ($state) {
52 case DOKU_LEXER_ENTER : 52 case DOKU_LEXER_ENTER :
53 return array($state, substr($match, 10, -1) ); 53 return array($state, substr($match, 10, -1) );
@@ -177,7 +177,7 @@ class syntax_plugin_itemtable extends DokuWiki_Syntax_Plugin {
177 return $res; 177 return $res;
178 } 178 }
179 179
180 function render($mode, $renderer, $data) { 180 function render($mode, Doku_Renderer $renderer, $data) {
181 // This will only render in xhtml 181 // This will only render in xhtml
182 if($mode == 'xhtml'){ 182 if($mode == 'xhtml'){
183 list($state, $match) = $data; 183 list($state, $match) = $data;