Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
Dwoo
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Common
Dwoo
Commits
fd41613a
Commit
fd41613a
authored
Sep 08, 2008
by
Seldaek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fixes upgrade issue from old classpath cache files
git-svn-id:
svn://dwoo.org/dwoo/trunk@174
0598d79b-80c4-4d41-97ba-ac86fbbd088b
parent
eeef80e6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Loader.php
lib/Dwoo/Loader.php
+3
-3
No files found.
lib/Dwoo/Loader.php
View file @
fd41613a
...
@@ -53,11 +53,11 @@ class Dwoo_Loader implements Dwoo_ILoader
...
@@ -53,11 +53,11 @@ class Dwoo_Loader implements Dwoo_ILoader
$this
->
cacheDir
=
$cacheDir
.
DIRECTORY_SEPARATOR
;
$this
->
cacheDir
=
$cacheDir
.
DIRECTORY_SEPARATOR
;
// include class paths or rebuild paths if the cache file isn't there
// include class paths or rebuild paths if the cache file isn't there
$foo
=
@
file_get_contents
(
$this
->
cacheDir
.
'classpath.cache.php'
);
$foo
=
@
file_get_contents
(
$this
->
cacheDir
.
'classpath.cache.
d'
.
Dwoo
::
RELEASE_TAG
.
'.
php'
);
if
(
$foo
)
{
if
(
$foo
)
{
$this
->
classPath
=
unserialize
(
$foo
)
+
$this
->
classPath
;
$this
->
classPath
=
unserialize
(
$foo
)
+
$this
->
classPath
;
}
else
{
}
else
{
$this
->
rebuildClassPathCache
(
$this
->
corePluginDir
,
$this
->
cacheDir
.
'classpath.cache.php'
);
$this
->
rebuildClassPathCache
(
$this
->
corePluginDir
,
$this
->
cacheDir
.
'classpath.cache.
d'
.
Dwoo
::
RELEASE_TAG
.
'.
php'
);
}
}
}
}
...
@@ -106,7 +106,7 @@ class Dwoo_Loader implements Dwoo_ILoader
...
@@ -106,7 +106,7 @@ class Dwoo_Loader implements Dwoo_ILoader
// a new class was added or the include failed so we rebuild the cache
// a new class was added or the include failed so we rebuild the cache
if
(
!
isset
(
$this
->
classPath
[
$class
])
||
!
(
include
$this
->
classPath
[
$class
]))
{
if
(
!
isset
(
$this
->
classPath
[
$class
])
||
!
(
include
$this
->
classPath
[
$class
]))
{
if
(
$forceRehash
)
{
if
(
$forceRehash
)
{
$this
->
rebuildClassPathCache
(
$this
->
corePluginDir
,
$this
->
cacheDir
.
'classpath.cache.php'
);
$this
->
rebuildClassPathCache
(
$this
->
corePluginDir
,
$this
->
cacheDir
.
'classpath.cache.
d'
.
Dwoo
::
RELEASE_TAG
.
'.
php'
);
foreach
(
$this
->
paths
as
$path
=>
$file
)
{
foreach
(
$this
->
paths
as
$path
=>
$file
)
{
$this
->
rebuildClassPathCache
(
$path
,
$file
);
$this
->
rebuildClassPathCache
(
$path
,
$file
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment