Changeset 94 for trunk


Ignore:
Timestamp:
May 25, 2020, 9:54:02 PM (4 years ago)
Author:
chronos
Message:
  • Fixed: Missing return statement in Setup CheckState method.
  • Fixed: Global $System variable is not used anymore.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Application/Version.php

    r92 r94  
    66// and system will need database update.
    77
    8 $Revision = 92;
     8$Revision = 94;
    99$DatabaseRevision = 79;
    10 $ReleaseTime = strtotime('2020-04-07');
     10$ReleaseTime = strtotime('2020-05-25');

  • trunk/Packages/Common/Base.php

    r69 r94  
    2121  function __construct(Application $System)
    2222  {
    23     $this->System = &$System;
    24     $this->Database = &$System->Database;
     23    $this->System = $System;
     24    $this->Database = $System->Database;
    2525  }
    2626}

  • trunk/Packages/Common/Common.php

    r92 r94  
    4141}
    4242
    43 class Paging
     43class Paging extends Base
    4444{
    4545  var $TotalCount;
    … …  
    4949  var $Page;
    5050
    51   function __construct()
     51  function __construct(Application &$System)
    5252  {
    53     global $System;
     53    parent::__construct($System);
    5454
    5555    $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];

  • trunk/Packages/Common/Setup.php

    r92 r94  
    402402  function CheckState()
    403403  {
    404     $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
     404    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
    405405      $this->UpdateManager->IsUpToDate();
    406406  }

  • trunk/Packages/Common/Table.php

    r92 r94  
    11<?php
    22
    3 class Control
     3class Control extends Base
    44{
    55  var $Name;
    … …  
    9898  var $Style;
    9999
    100   function __construct()
     100  function __construct(Application $System)
    101101  {
    102     global $System;
     102    parent::__construct($System);
    103103
    104104    $this->Columns = array();
    105105    $this->Table = new TableMemory();
    106106    $this->OrderDirSQL = array('ASC', 'DESC');
    107     $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'),
    108       $System->Link('/images/sort_desc.png'));
     107    $this->OrderArrowImage = array($this->System->Link('/images/sort_asc.png'),
     108      $this->System->Link('/images/sort_desc.png'));
    109109    $this->DefaultOrder = 0;
    110110    $this->Style = 'BaseTable';
Note: See TracChangeset for help on using the changeset viewer.