[Pkg-drupal-commits] r1841 - in /branches/drupal-5.0/debian: changelog cron.sh

[luigi at users.alioth.debian.org]

Author: luigi
Date: Fri Dec  7 20:44:15 2007
New Revision: 1841

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1841
Log:
Added check of BASE_URL in baseurl.php (Closes: #448774)

Modified:
    branches/drupal-5.0/debian/changelog
    branches/drupal-5.0/debian/cron.sh

Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=1841&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Fri Dec  7 20:44:15 2007
@@ -8,6 +8,9 @@
   * New upstream release
     - Fixes SQL Injection vulnerability in contributed modules
       (Ref: DRUPAL-SA-2007-031, CVE-TBA)
+
+  * debian/cron.sh
+    - Added check of BASE_URL in baseurl.php (Closes: #448774)
 
  -- Luigi Gangitano <luigi at debian.org>  Fri, 07 Dec 2007 21:29:18 +0100
 

Modified: branches/drupal-5.0/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/cron.sh?rev=1841&op=diff
==============================================================================
--- branches/drupal-5.0/debian/cron.sh (original)
+++ branches/drupal-5.0/debian/cron.sh Fri Dec  7 20:44:15 2007
@@ -1,8 +1,11 @@
 #!/bin/sh
 # $Id$
 
-for i in /etc/drupal/5/sites/*/settings.php ; do
-	BASE_URL=`grep '^$base_url' $i | cut -d"'" -f2`
+for site in /etc/drupal/5/sites/* ; do
+	for file in $site/baseurl.php $site/settings.php; do
+		[ -f "$file" ] && BASE_URL=`grep '^$base_url' $file | cut -d"'" -f2`
+		[ "X$BASE_URL" != "X" ] && break
+	done
 	if [ "X$BASE_URL" = "X" ] ; then
 		BASE_URL='http://localhost/drupal5'
 	fi