galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to v26 (#172)

Browse Source 
* A bunch of new updates from icehrm pro

* Push changes to frontend
This commit is contained in:
Thilina Hasantha
2019-02-03 14:00:34 +01:00
committed by GitHub
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/Classes/FileService.php
View File

@@ -18,7 +18,7 @@ along with Ice Framework. If not, see <http://www.gnu.org/licenses/>.
------------------------------------------------------------------
Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
*/
namespace Classes;
@@ -171,6 +171,8 @@ class FileService
$profile->image = BASE_URL."images/user_male.png";
}
}
} elseif (substr($file->filename, 0, 8) === 'https://') {
$profile->image = $file->filename;
} else {
$profile->image = CLIENT_BASE_URL.'data/'.$file->filename;
}
@@ -210,6 +212,8 @@ class FileService
}
$profile->image = $expireUrl;
} elseif (substr($file->filename, 0, 8) === 'https://') {
$profile->image = $file->filename;
} else {
$profile->image = CLIENT_BASE_URL.'data/'.$file->filename;
}
@@ -224,7 +228,7 @@ class FileService
return $profile;
}
public function getFileUrl($fileName, $isExpiring = true)
public function getFileUrl($fileName, $isExpiring = true)
{
$file = new File();
$file->Load('name = ?', array($fileName));