Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1069773
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Jul 20, 6:34 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Tue, Jul 22, 6:34 AM (5 h, 27 m)
Engine
blob
Format
Raw Data
Handle
692669
Attached To
rINP In-Portal
in-portal
View Options
Index: trunk/kernel/units/themes/themes_tag_processor.php
===================================================================
--- trunk/kernel/units/themes/themes_tag_processor.php (revision 4525)
+++ trunk/kernel/units/themes/themes_tag_processor.php (revision 4526)
@@ -1,48 +1,56 @@
<?php
class ThemesTagProcessor extends kDBTagProcessor
{
function StylesheetFile($params)
{
$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
if (!$object->GetDBField('StyleName')) {
// no stylesheet is associated with current theme
return '';
}
$css_url = $this->Application->BaseURL('/kernel/stylesheets');
$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH.'/', $css_url), '/' );
$last_compiled = $object->GetDBField('LastCompiled');
$style_name = strtolower( $object->GetDBField('StyleName') );
if( file_exists($css_path.'/'.$style_name.'-'.$last_compiled.'.css') )
{
- $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ $ret = rtrim($css_url, '/').'/'.$style_name.'-'.$last_compiled.'.css';
}
else
{
+ // search for previously compiled stylesheet
$last_compiled = 0;
if( $dh = opendir($css_path) )
{
while( ($file = readdir($dh)) !== false )
{
if( preg_match('/(.*)-([\d]+).css/', $file, $rets) )
{
if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
}
}
closedir($dh);
}
- if($last_compiled) $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ if ($last_compiled) {
+ // found
+ $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ }
+ else {
+ // not found
+ return '';
+ }
}
if (isset($params['file_only'])) return $ret;
return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
}
}
?>
\ No newline at end of file
Property changes on: trunk/kernel/units/themes/themes_tag_processor.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: trunk/core/units/themes/themes_tag_processor.php
===================================================================
--- trunk/core/units/themes/themes_tag_processor.php (revision 4525)
+++ trunk/core/units/themes/themes_tag_processor.php (revision 4526)
@@ -1,48 +1,56 @@
<?php
class ThemesTagProcessor extends kDBTagProcessor
{
function StylesheetFile($params)
{
$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, $params );
if (!$object->GetDBField('StyleName')) {
// no stylesheet is associated with current theme
return '';
}
$css_url = $this->Application->BaseURL('/kernel/stylesheets');
$css_path = rtrim( str_replace( $this->Application->BaseURL(), FULL_PATH.'/', $css_url), '/' );
$last_compiled = $object->GetDBField('LastCompiled');
$style_name = strtolower( $object->GetDBField('StyleName') );
if( file_exists($css_path.'/'.$style_name.'-'.$last_compiled.'.css') )
{
- $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ $ret = rtrim($css_url, '/').'/'.$style_name.'-'.$last_compiled.'.css';
}
else
{
+ // search for previously compiled stylesheet
$last_compiled = 0;
if( $dh = opendir($css_path) )
{
while( ($file = readdir($dh)) !== false )
{
if( preg_match('/(.*)-([\d]+).css/', $file, $rets) )
{
if( $rets[1] == $style_name && $rets[2] > $last_compiled ) $last_compiled = $rets[2];
}
}
closedir($dh);
}
- if($last_compiled) $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ if ($last_compiled) {
+ // found
+ $ret = $css_url.'/'.$style_name.'-'.$last_compiled.'.css';
+ }
+ else {
+ // not found
+ return '';
+ }
}
if (isset($params['file_only'])) return $ret;
return '<link rel="stylesheet" rev="stylesheet" href="'.$ret.'" type="text/css" media="screen" />';
}
}
?>
\ No newline at end of file
Property changes on: trunk/core/units/themes/themes_tag_processor.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Event Timeline
Log In to Comment