Changeset 10937


Ignore:
Timestamp:
May 18, 2011, 11:27:11 PM (13 years ago)
Author:
grum
Message:

fix bug:2305 - local file is hardcoded

Location:
extensions/gally/gally-default
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/gally/gally-default/admin/Conf.class.inc.php

    r8528 r10937  
    187187
    188188    $configLocal = new Conf();
    189     $configLocal->setFileName(PHPWG_ROOT_PATH."local/themes/$theme/conf/local.conf");
     189    $configLocal->setFileName(PHPWG_ROOT_PATH.PWG_LOCAL_DIR."themes/$theme/conf/local.conf");
    190190    $configLocal->read();
    191191

  • extensions/gally/gally-default/admin/GallyDefault.class.inc.php

    r8585 r10937  
    137137    $this->config->setFileName($this->directories['conf.local']."/default.conf");
    138138    $this->config->read(false);
    139     $this->config->setFileName(PHPWG_ROOT_PATH."local/themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf");
     139    $this->config->setFileName(PHPWG_ROOT_PATH.PWG_LOCAL_DIR."themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf");
    140140    $this->config->read(false);
    141141  }

  • extensions/gally/gally-default/admin/GallyFunctions.class.inc.php

    r6956 r10937  
    1616    $config->setFileName(PHPWG_THEMES_PATH.$themeDir.'/conf/default.conf');
    1717    $config->read();
    18     $config->setFileName(PHPWG_ROOT_PATH."local/themes/".$themeDir."/conf/local.conf");
     18    $config->setFileName(PHPWG_ROOT_PATH.PWG_LOCAL_DIR."themes/".$themeDir."/conf/local.conf");
    1919    $config->read(false);
    2020

  • extensions/gally/gally-default/release_notes.txt

    r10736 r10937  
    135135  |         |            |   . compatibility with piwigo 2.2
    136136  |         |            |
     137  | 1.4.3   | 2011-05-18 | * mantis feature:2305
     138  |         |            |   . local file is hardcoded
     139  |         |            |
     140  |         |            |
    137141  |         |            |
    138142  |         |            |

  • extensions/gally/gally-default/template/index.tpl

    r8528 r10937  
    2323        <select onchange="document.location = this.options[this.selectedIndex].value;">
    2424          {foreach from=$image_orders item=image_order }
    25           <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}}>{$image_order.DISPLAY}</option>
     25          <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
    2626          {/foreach}
    2727        </select>

  • extensions/gally/gally-default/themeconf.inc.php

    r10736 r10937  
    22/*
    33Theme Name: Gally
    4 Version: 1.4.2
     4Version: 1.4.3
    55Description: Parent theme for all the Gally themes
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=382
Note: See TracChangeset for help on using the changeset viewer.