harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-01-09 22:18:53 -08:00
commit 8a930241a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -813,7 +813,7 @@ if(! class_exists('App')) {
return $this->curl_headers; return $this->curl_headers;
} }
//FIXME or remove /* //MicMee 20120109 function no longer in use commented out
function get_cached_avatar_image($avatar_image){ function get_cached_avatar_image($avatar_image){
if($this->cached_profile_image[$avatar_image]) if($this->cached_profile_image[$avatar_image])
return $this->cached_profile_image[$avatar_image]; return $this->cached_profile_image[$avatar_image];
@ -835,6 +835,7 @@ if(! class_exists('App')) {
} }
return $this->cached_profile_image[$avatar_image]; return $this->cached_profile_image[$avatar_image];
} }
*/
function get_template_engine() { function get_template_engine() {
return $this->theme['template_engine']; return $this->theme['template_engine'];