← Back to branch summary

~ubuntu-branches/ubuntu/saucy/phpmyadmin/saucy-proposed

« back to all changes in this revision

Viewing changes to libraries/navigation/NavigationHeader.class.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2013-08-04 13:24:37 UTC
  • mfrom: (1.2.44)
  • Revision ID: package-import@ubuntu.com-20130804132437-jznw8efwy4hr1nms
Tags: 4:4.0.5-1
* New upstream release.
  - Fixes security issue PMASA-2013-10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/navigation/NavigationHeader.class.php
171
171
     */
172
172
    private function _links()
173
173
    {
174
 
        $iconicNav = $GLOBALS['cfg']['NavigationBarIconic'];
175
 
        $showIcon = $iconicNav === true || $iconicNav === 'both';
176
 
        $showText = $iconicNav === false || $iconicNav === 'both';
 
174
        // always iconic
 
175
        $showIcon = true; 
 
176
        $showText = false; 
177
177
 
178
178
        $retval  = '<!-- LINKS START -->';
179
179
        $retval .= '<div id="leftframelinks">';