[geeklog-cvs] geeklog: Removed comented out code I had left
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Apr 28 10:28:03 EDT 2012
changeset 8632:576ff4bc62f6
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/576ff4bc62f6
user: Tom <websitemaster at cogeco.net>
date: Sat Apr 28 10:05:28 2012 -0400
description:
Removed comented out code I had left
diffstat:
public_html/lib-common.php | 88 ----------------------------------------------
1 files changed, 0 insertions(+), 88 deletions(-)
diffs (105 lines):
diff -r 369cb8221370 -r 576ff4bc62f6 public_html/lib-common.php
--- a/public_html/lib-common.php Sat Apr 28 10:02:45 2012 -0400
+++ b/public_html/lib-common.php Sat Apr 28 10:05:28 2012 -0400
@@ -951,50 +951,6 @@
$header->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
}
- /* *************************************************** */
- /* Tom - Not sure if this is needed anymore since topic is now retrieved from article.php
- // get topic if not on home page
- if( !isset( $_GET['topic'] ))
- {
- if( isset( $_GET['story'] ))
- {
- $sid = COM_applyFilter( $_GET['story'] );
- }
- elseif( isset( $_GET['sid'] ))
- {
- $sid = COM_applyFilter( $_GET['sid'] );
- }
- elseif( isset( $_POST['story'] ))
- {
- $sid = COM_applyFilter( $_POST['story'] );
- }
- if( empty( $sid ) && $_CONF['url_rewrite'] &&
- ( strpos( $_SERVER['PHP_SELF'], 'article.php' ) !== false ))
- {
- COM_setArgNames( array( 'story', 'mode' ));
- $sid = COM_applyFilter( COM_getArgument( 'story' ));
- }
- if(!empty($sid)) {
- // Need to grab default topic if topic not known but story is
- $sql = "SELECT ta.tid
- FROM {$_TABLES['stories']} s, {$_TABLES['topic_assignments']} ta
- WHERE ta.type = 'article' AND ta.id = s.sid AND ta.tdefault = 1
- AND sid='$sid'";
- $result = DB_query($sql);
- $numrows = DB_numRows($result);
- if ($numrows == 1) {
- $A = DB_fetchArray($result);
- $topic = $A['tid']
- }
- }
- }
- else
- {
- $topic = COM_applyFilter( $_GET['topic'] );
- }
- */
- /* *************************************************** */
-
$feed_url = array();
if( $_CONF['backend'] == 1 ) // add feed-link to header if applicable
{
@@ -1673,50 +1629,6 @@
$header->set_var('xmlns', ' xmlns="http://www.w3.org/1999/xhtml"');
}
- /* *************************************************** */
- /* Tom - Not sure if this is needed anymore since topic is now retrieved from article.php
- // get topic if not on home page
- if( !isset( $_GET['topic'] ))
- {
- if( isset( $_GET['story'] ))
- {
- $sid = COM_applyFilter( $_GET['story'] );
- }
- elseif( isset( $_GET['sid'] ))
- {
- $sid = COM_applyFilter( $_GET['sid'] );
- }
- elseif( isset( $_POST['story'] ))
- {
- $sid = COM_applyFilter( $_POST['story'] );
- }
- if( empty( $sid ) && $_CONF['url_rewrite'] &&
- ( strpos( $_SERVER['PHP_SELF'], 'article.php' ) !== false ))
- {
- COM_setArgNames( array( 'story', 'mode' ));
- $sid = COM_applyFilter( COM_getArgument( 'story' ));
- }
- if(!empty($sid)) {
- // Need to grab default topic if topic not known but story is
- $sql = "SELECT ta.tid
- FROM {$_TABLES['stories']} s, {$_TABLES['topic_assignments']} ta
- WHERE ta.type = 'article' AND ta.id = s.sid AND ta.tdefault = 1
- AND sid='$sid'";
- $result = DB_query($sql);
- $numrows = DB_numRows($result);
- if ($numrows == 1) {
- $A = DB_fetchArray($result);
- $topic = $A['tid']
- }
- }
- }
- else
- {
- $topic = COM_applyFilter( $_GET['topic'] );
- }
- */
- /* *************************************************** */
-
$feed_url = array();
if( $_CONF['backend'] == 1 ) // add feed-link to header if applicable
{
More information about the geeklog-cvs
mailing list