← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phpmyadmin/trusty

« back to all changes in this revision

Viewing changes to libraries/Config.class.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2013-10-07 20:18:01 UTC
  • mfrom: (1.2.46)
  • Revision ID: package-import@ubuntu.com-20131007201801-l5l0ril5992p8sxz
Tags: 4:4.0.8-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/Config.class.php
102
102
     */
103
103
    function checkSystem()
104
104
    {
105
 
        $this->set('PMA_VERSION', '4.0.6');
 
105
        $this->set('PMA_VERSION', '4.0.8');
106
106
        /**
107
107
         * @deprecated
108
108
         */
1271
1271
 
1272
1272
                // And finally the path could be already set from REQUEST_URI
1273
1273
                if (empty($url['path'])) {
1274
 
                    $path = parse_url($GLOBALS['PMA_PHP_SELF']);
 
1274
                    // we got a case with nginx + php-fpm where PHP_SELF
 
1275
                    // was not set, so PMA_PHP_SELF was not set as well 
 
1276
                    if (isset($GLOBALS['PMA_PHP_SELF'])) {
 
1277
                        $path = parse_url($GLOBALS['PMA_PHP_SELF']);
 
1278
                    } else {
 
1279
                        $path = parse_url(PMA_getenv('REQUEST_URI'));
 
1280
                    }
1275
1281
                    $url['path'] = $path['path'];
1276
1282
                }
1277
1283
            }