From 8b52d9cde47953fb70587c6d404ec681fff71bee Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 24 Nov 2008 05:58:38 +0000
Subject: Revert the site_title change

---
 core/config/config.php      |  8 --------
 core/helpers/core_block.php | 35 -----------------------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 core/helpers/core_block.php

(limited to 'core')

diff --git a/core/config/config.php b/core/config/config.php
index 745fd76b..67c913bb 100644
--- a/core/config/config.php
+++ b/core/config/config.php
@@ -136,11 +136,3 @@ $config['modules'] = array
   MODPATH . 'search'
 );
 
-/**
- * Set the global site title.
- * Valid values are:
- * FALSE: Use the default, which is the album or image title
- * A string value that ends with '-' will append the string befor the default value
- * A string value without a trailing '-' will replace the default value.
- */
-$config['site_title'] = "Gallery3 Rocks";
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
deleted file mode 100644
index aecbde47..00000000
--- a/core/helpers/core_block.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class core_block_Core {
-  public static function head($theme) {
-    $site_title = Kohana::config("core.site_title");
-    $title = $theme->item()->title;
-    if (!empty($site_title)) {
-      if (substr($site_title, -1) == "-") {
-        $title = "$site_title $title";
-      } else {
-        $title = $site_title;
-      }
-    } else {
-      $title =  _("Browse Photos") . "::$title"; 
-    }
-    return "<title>$title</title>";
-  }
-}
-- 
cgit v1.2.3