[phpwiki-checkins] SF.net SVN: phpwiki:[8987] trunk/lib/PageList.php

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

Revision: 8987
          http://sourceforge.net/p/phpwiki/code/8987
Author:   vargenau
Date:     2014-07-18 10:11:37 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Use __construct

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-07-18 09:44:34 UTC (rev 8986)
+++ trunk/lib/PageList.php	2014-07-18 10:11:37 UTC (rev 8987)
@@ -52,7 +52,7 @@
 {
     public $_tdattr = array();
 
-    function _PageList_Column_base($default_heading, $align = false)
+    function __construct($default_heading, $align = false)
     {
         $this->_heading = $default_heading;
 
@@ -271,7 +271,7 @@
     function _getValue($page_handle, &$revision_handle)
     {
         //FIXME: check if $this is available in the parent (->need_rev)
-        $val = _PageList_Column::_getValue($page_handle, $revision_handle);
+        $val = parent::_getValue($page_handle, $revision_handle);
         return $val ? $this->_textIfTrue : $this->_textIfFalse;
     }
 }
@@ -362,7 +362,7 @@
     function __construct($field, $default_heading, $align = false,
                          $search = false, $hilight_re = false)
     {
-        $this->_PageList_Column($field, $default_heading, $align);
+        parent::__construct($field, $default_heading, $align);
         $this->bytes = 50;
         $this->search = $search;
         $this->hilight_re = $hilight_re;
@@ -453,7 +453,7 @@
             return $page_handle->score;
         elseif (is_array($page_handle) and !empty($page_handle['score']))
             return $page_handle['score']; else
-            return substr(_PageList_Column::_getValue($page_handle, $revision_handle), 0, 50);
+            return substr(parent::_getValue($page_handle, $revision_handle), 0, 50);
     }
 }
 
@@ -467,7 +467,7 @@
 
     function _getValue($page_handle, &$revision_handle)
     {
-        $author = _PageList_Column::_getValue($page_handle, $revision_handle);
+        $author = parent::_getValue($page_handle, $revision_handle);
         if ($this->dbi->isWikiPage($author))
             return WikiLink($author);
         else
@@ -476,7 +476,7 @@
 
     function _getSortableValue($page_handle, &$revision_handle)
     {
-        return _PageList_Column::_getValue($page_handle, $revision_handle);
+        return parent::_getValue($page_handle, $revision_handle);
     }
 }
 
@@ -510,7 +510,7 @@
 
     function _getSortableValue($page_handle, &$revision_handle)
     {
-        return _PageList_Column::_getValue($page_handle, $revision_handle);
+        return parent::_getValue($page_handle, $revision_handle);
     }
 }
 
@@ -518,9 +518,9 @@
 {
     public $_field = 'pagename';
 
-    function _PageList_Column_pagename()
+    function __construct()
     {
-        $this->_PageList_Column_base(_("Page Name"));
+        parent::__construct(_("Page Name"));
         global $request;
         $this->dbi = &$request->getDbh();
     }

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