Merged in bugfix/HOR-3670-PQ (pull request #5913)

HOR-3670

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-08-11 20:07:23 +00:00
committed by Julio Cesar Laura Avendaño
27 changed files with 91 additions and 443 deletions

View File

@@ -790,7 +790,7 @@ class adminProxy extends HttpProxyController
{
$uplogo = PATH_TPL . 'setup' . PATH_SEP . 'uplogo.html';
$width = "100%";
$upload = new replacementLogo();
$upload = new ReplacementLogo();
$aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']);
$sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']);
$check = '';
@@ -1093,7 +1093,7 @@ class adminProxy extends HttpProxyController
*/
public function getNameCurrentLogo()
{
$upload = new replacementLogo();
$upload = new ReplacementLogo();
$aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']);
$sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']);
return $sPhotoSelect;

View File

@@ -465,7 +465,7 @@ class Main extends Controller
if (defined( "SYS_SYS" )) {
if (($aFotoSelect = $this->memcache->get( 'aFotoSelect' )) === false) {
$oLogoR = new replacementLogo();
$oLogoR = new ReplacementLogo();
$aFotoSelect = $oLogoR->getNameLogo( (isset( $_SESSION['USER_LOGGED'] )) ? $_SESSION['USER_LOGGED'] : '' );
$this->memcache->set( 'aFotoSelect', $aFotoSelect, 1 * 3600 );
}