← Back to branch summary

~ubuntu-branches/ubuntu/wily/phpsysinfo/wily

« back to all changes in this revision

Viewing changes to includes/output/class.Output.inc.php

  • Committer: Package Import Robot
  • Author(s): Bhavani Shankar
  • Date: 2012-07-05 20:26:44 UTC
  • mfrom: (1.1.10) (4.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20120705202644-0tsd2qggs42x8luv
Tags: 3.0.17-1ubuntu1
https://launchpad.net/bugs/567821
https://launchpad.net/bugs/562121
* Merge from Debian unstable. Remaining changes:
  - debian/phpsysinfo.install: install missing data/ dir (LP: #567821),
    thanks to Dan Rice.
  - Add a simple manpage for phpsysinfo
* Dropped changes:
  - debian/control: add dependency on php5-xsl (LP: #562121)
  - Add debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
includes/output/class.Output.inc.php
9
9
 * @author    Michael Cramer <BigMichi1@users.sourceforge.net>
10
10
 * @copyright 2009 phpSysInfo
11
11
 * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
12
 
 * @version   SVN: $Id: class.Output.inc.php 315 2009-09-02 15:48:31Z bigmichi1 $
 
12
 * @version   SVN: $Id: class.Output.inc.php 569 2012-04-16 06:08:18Z namiltd $
13
13
 * @link      http://phpsysinfo.sourceforge.net
14
14
 */
15
15
 /**
37
37
     */
38
38
    public function __construct()
39
39
    {
 
40
        CommonFunctions::checkForSVN();
40
41
        CommonFunctions::checkForExtensions();
41
42
        $this->error = Error::singleton();
42
43
        $this->_checkConfig();