[phpwiki-checkins] SF.net SVN: phpwiki:[9353] trunk/lib/BlockParser.php

[<var...@us...>]

Revision: 9353
          http://sourceforge.net/p/phpwiki/code/9353
Author:   vargenau
Date:     2014-11-20 17:56:52 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Rename private functions without underscores

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2014-11-20 17:49:49 UTC (rev 9352)
+++ trunk/lib/BlockParser.php	2014-11-20 17:56:52 UTC (rev 9353)
@@ -355,11 +355,10 @@
 
 class ParsedBlock extends Block_HtmlElement
 {
-
     function __construct(&$input, $tag = 'div', $attr = array())
     {
         parent::__construct($tag, $attr);
-        $this->_initBlockTypes();
+        $this->initBlockTypes();
         $this->_parse($input);
     }
 
@@ -367,10 +366,10 @@
     {
         // php5 failed to advance the block. php5 copies objects by ref.
         // nextBlock == block, both are the same objects. So we have to clone it.
-        for ($block = $this->_getBlock($input);
+        for ($block = $this->getBlock($input);
              $block;
              $block = (is_object($nextBlock) ? clone($nextBlock) : $nextBlock)) {
-            while ($nextBlock = $this->_getBlock($input)) {
+            while ($nextBlock = $this->getBlock($input)) {
                 // Attempt to merge current with following block.
                 if (!($merged = $block->merge($nextBlock))) {
                     break; // can't merge
@@ -382,7 +381,7 @@
     }
 
     // FIXME: hackish. This should only be called once.
-    private function _initBlockTypes()
+    private function initBlockTypes()
     {
         // better static or global?
         static $_regexpset, $_block_types;
@@ -417,7 +416,7 @@
         }
     }
 
-    private function _getBlock(&$input)
+    private function getBlock(&$input)
     {
         $this->_atSpace = $input->skipSpace();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.