[phpwiki-checkins] SF.net SVN: phpwiki:[9898] trunk/lib

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

Revision: 9898
          http://sourceforge.net/p/phpwiki/code/9898
Author:   vargenau
Date:     2016-07-21 12:15:07 +0000 (Thu, 21 Jul 2016)
Log Message:
-----------
_PageList_Column: use __construct

Modified Paths:
--------------
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/LinkSearch.php
    trunk/lib/plugin/ListPages.php
    trunk/lib/plugin/SemanticSearch.php
    trunk/lib/plugin/WantedPages.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/lib/wikilens/PageListColumns.php

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/FullTextSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -168,10 +168,10 @@
 {
     private $parentobj;
 
-    function _PageList_Column_WantedPages_links(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/LinkSearch.php
===================================================================
--- trunk/lib/plugin/LinkSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/LinkSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -170,7 +170,7 @@
 class _PageList_Column_LinkSearch_link
     extends _PageList_Column
 {
-    function _PageList_Column_LinkSearch_link($field, $heading, &$pagelist)
+    function __construct($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/ListPages.php
===================================================================
--- trunk/lib/plugin/ListPages.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/ListPages.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -137,10 +137,10 @@
 // how many back-/forwardlinks for this page
 class _PageList_Column_ListPages_count extends _PageList_Column
 {
-    function _PageList_Column_ListPages_count($field, $display, $backwards = false)
+    function __construct($field, $display, $backwards = false)
     {
         $this->_direction = $backwards;
-        return $this->_PageList_Column($field, $display, 'center');
+        parent::__construct($field, $display, 'center');
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/SemanticSearch.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -436,7 +436,7 @@
 class _PageList_Column_SemanticSearch_relation
     extends _PageList_Column
 {
-    function _PageList_Column_SemanticSearch_relation($field, $heading, &$pagelist)
+    function __construct($field, $heading, &$pagelist)
     {
         $this->_field = $field;
         $this->_heading = $heading;

Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/WantedPages.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -158,10 +158,10 @@
 // which links to the missing page
 class _PageList_Column_WantedPages_wanted extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_wanted(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)
@@ -183,10 +183,10 @@
  */
 class _PageList_Column_WantedPages_links extends _PageList_Column
 {
-    function _PageList_Column_WantedPages_links(&$params)
+    function __construct(&$params)
     {
         $this->parentobj =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/plugin/WikiTranslation.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -494,7 +494,7 @@
 
 class _PageList_Column_customlang extends _PageList_Column
 {
-    function _PageList_Column_customlang($field, $from_lang, $plugin)
+    function __construct($field, $from_lang, $plugin)
     {
         /**
          * @var WikiRequest $request
@@ -512,7 +512,7 @@
             $this->_field = substr($field, 7);
         //$heading = $field;
         $this->dbi = &$request->getDbh();
-        $this->_PageList_Column_base($this->_field);
+        _PageList_Column_base::__construct($this->_field);
     }
 
     function _getValue($page, $revision_handle)

Modified: trunk/lib/wikilens/PageListColumns.php
===================================================================
--- trunk/lib/wikilens/PageListColumns.php	2016-07-21 10:16:06 UTC (rev 9897)
+++ trunk/lib/wikilens/PageListColumns.php	2016-07-21 12:15:07 UTC (rev 9898)
@@ -60,7 +60,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -93,7 +93,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -117,7 +117,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_selectedBuddies = $this->_pagelist->getOption('selectedBuddies');
     }
 
@@ -159,7 +159,7 @@
                 $this->_user =& RatingsUserFactory::getUser($GLOBALS['request']->_user->_userid);
             }
         }
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
     }
@@ -230,7 +230,7 @@
     function __construct($params)
     {
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
         if (!$this->_dimension) $this->_dimension = 0;
     }
@@ -287,9 +287,8 @@
         $this->_active_ratings_user =& RatingsUserFactory::getUser($active_user->getId());
 
         $this->_pagelist =& $params[3];
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        parent::__construct($params[0], $params[1], $params[2]);
         $this->_dimension = $this->_pagelist->getOption('dimension');
-        ;
         if (!$this->_dimension) $this->_dimension = 0;
         $this->_users = $this->_pagelist->getOption('users');
     }
@@ -342,7 +341,7 @@
         // No, I don't know exactly why, but this needs to be a reference for
         // the memoization in pearson_similarity and mean_rating to work
         $this->_active_ratings_user = new RatingsUser($active_user->getId());
-        $this->_PageList_Column($params[0], $params[1], $params[2]);
+        _PageList_Column::__construct($params[0], $params[1], $params[2]);
 
         if (!empty($params[3])) {
             $this->_pagelist =& $params[3];

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