aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-24 03:56:37 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-24 03:56:37 +0000
commit038fd680f1a8ef48b2a678b1ec47280fd6ded1d7 (patch)
tree21a2e38bf3b35b108c45d442813e0e94269cff78
parentbbc49787b4efd62ce5904af572eb336758416140 (diff)
downloadforums-038fd680f1a8ef48b2a678b1ec47280fd6ded1d7.tar
forums-038fd680f1a8ef48b2a678b1ec47280fd6ded1d7.tar.gz
forums-038fd680f1a8ef48b2a678b1ec47280fd6ded1d7.tar.bz2
forums-038fd680f1a8ef48b2a678b1ec47280fd6ded1d7.tar.xz
forums-038fd680f1a8ef48b2a678b1ec47280fd6ded1d7.zip
Fixed cache expiration and missing lang strings on index/viewforum.
git-svn-id: file:///svn/phpbb/trunk@3362 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/db/mysql.php19
-rw-r--r--phpBB/language/en/lang_main.php2
-rw-r--r--phpBB/templates/subSilver/index_body.html2
-rw-r--r--phpBB/templates/subSilver/viewforum_subforum.html2
4 files changed, 14 insertions, 11 deletions
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php
index 9925779e33..ba6a632b12 100644
--- a/phpBB/db/mysql.php
+++ b/phpBB/db/mysql.php
@@ -122,8 +122,13 @@ class sql_db
if ($query != '')
{
global $cache;
- if (!$expire_time || !$cache->sql_load($query))
+ if (!$expire_time || !$cache->sql_load($query, $expire_time))
{
+ if ($expire_time)
+ {
+ $cache_result = true;
+ }
+
$this->query_result = false;
$this->num_queries++;
@@ -179,18 +184,18 @@ class sql_db
$this->open_queries[] = $this->query_result;
}
+
+ if (!empty($cache_result))
+ {
+ $cache->sql_save($query, $this->query_result);
+ @mysql_free_result(array_pop($this->open_queries));
+ }
}
else
{
return false;
}
- if ($expire_time && $this->query_result)
- {
- $cache->sql_save($query, $this->query_result);
- @mysql_free_result(array_pop($this->open_queries));
- }
-
return ( $this->query_result) ? $this->query_result : false;
}
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index af70e6f6f8..a2d678d36f 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -29,7 +29,6 @@ $lang = array_merge($lang, array(
'FORUM' => 'Forum',
'SUBFORUM' => 'Subforum',
'SUBFORUMS' => 'Subforums',
- 'CATEGORY' => 'Category',
'TOPIC' => 'Topic',
'TOPICS' => 'Topics',
'REPLIES' => 'Replies',
@@ -177,7 +176,6 @@ $lang = array_merge($lang, array(
'Index' => 'Index',
'No_Posts' => 'No Posts',
'No_forums' => 'This board has no forums',
- 'Category_not_exist' => 'The category you selected does not exist',
'Private_Message' => 'Private Message',
'Private_Messages' => 'Private Messages',
'Who_is_Online' => 'Who is Online',
diff --git a/phpBB/templates/subSilver/index_body.html b/phpBB/templates/subSilver/index_body.html
index cf3ab9d5db..bae95e90fd 100644
--- a/phpBB/templates/subSilver/index_body.html
+++ b/phpBB/templates/subSilver/index_body.html
@@ -283,7 +283,7 @@ function hash(form,login_url) {
<!-- ELSE -->
<tr>
<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
- <td class="row1" width="100%" height="50" valign="top"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{L_MODERATORS}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
+ <td class="row1" width="100%" height="50" valign="top"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{forumrow.LAST_POST}</span></td>
diff --git a/phpBB/templates/subSilver/viewforum_subforum.html b/phpBB/templates/subSilver/viewforum_subforum.html
index 0efd298888..dff4565069 100644
--- a/phpBB/templates/subSilver/viewforum_subforum.html
+++ b/phpBB/templates/subSilver/viewforum_subforum.html
@@ -13,7 +13,7 @@
<!-- ELSE -->
<tr>
<td class="row1" width="50" height="50" align="center" valign="middle">{forumrow.FORUM_FOLDER_IMG}</td>
- <td class="row1" width="100%" height="50" valign="top"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{L_MODERATORS}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
+ <td class="row1" width="100%" height="50" valign="top"><span class="gen"><a href="{forumrow.U_VIEWFORUM}" class="forumlink">{forumrow.FORUM_NAME}</a></span><br /><table cellspacing="5" cellpadding="0" border="0"><tr><td><span class="gensmall">{forumrow.FORUM_DESC}</span></td></tr></table><span class="gensmall"><!-- IF forumrow.MODERATORS --><b>{forumrow.L_MODERATOR_STR}:</b> {forumrow.MODERATORS}<br /><!-- ENDIF --><!-- IF forumrow.SUBFORUMS --><br /><b>{forumrow.L_SUBFORUM_STR}</b> {forumrow.SUBFORUMS}<!-- ENDIF --></span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{forumrow.POSTS}</span></td>
<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{forumrow.LAST_POST}</span></td>
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-10 23:48:51 +0000