summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarl <>2008-10-13 10:54:59 +0000
committercarl <>2008-10-13 10:54:59 +0000
commit54d7e31492586e274c32afc3b922a5b7bd90c9ab (patch)
treece813bf0c1f40d4f4b16d7bf2ce4cb9876313ee6
parent73daf45e030b66b045718d1878b28105f021d5ab (diff)
#856 - Assets PRADO_CHMOD constant missing in several places
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/TAssetManager.php7
-rw-r--r--framework/Web/UI/TClientScriptManager.php3
3 files changed, 9 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 28883e2c..1e335069 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,6 @@
Version 3.1.3 To Be Released
============================
+BUG: Ticket#856 - Assets PRADO_CHMOD constant missing in several places (Carl)
ENH: Ticket#848 - TCache "set" and "add" with empty values (Carl)
ENH: Ticket#756 - TDateFormat & TNumberFormat - allow settings default text when Value isn't set. (Carl)
BUG: Ticket#834 - TDbCommandBuilder::applyOrdering(): Add support for function calls in ORDER BY clause (Knut)
diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index d8028d93..0ea8fed7 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id$
* @package System.Web
@@ -267,7 +267,10 @@ class TAssetManager extends TModule
else if(is_file($src.DIRECTORY_SEPARATOR.$file))
{
if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+ {
@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+ @chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
+ }
}
else
$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
@@ -333,4 +336,4 @@ class TAssetManager extends TModule
}
-?>
+?>
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 83fdf789..2a4389c8 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -169,7 +169,10 @@ class TClientScriptManager extends TApplicationComponent
$scriptLoaderPath = $path.'/'.basename(self::SCRIPT_LOADER);
$scriptLoaderSrc = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::SCRIPT_LOADER;
if(!is_file($scriptLoaderPath))
+ {
copy($scriptLoaderSrc, $scriptLoaderPath);
+ chmod($scriptLoaderPath, PRADO_CHMOD);
+ }
$url .= '/'.basename(self::SCRIPT_LOADER).'?js='.implode(',', $packages);
if($debug!==false && $this->getApplication()->getMode()===TApplicationMode::Debug)
{