Permalink
Browse files

10.4.13 - yacs Martin RC6 -fixed a small SQL request in sections/sect…

…ions.php

git-svn-id: http://yacs.googlecode.com/svn/trunk@128 799ccead-9442-0410-8758-a113ef2b9449
  • Loading branch information...
1 parent bab3b92 commit d6edab612c947208c3605b0cfa85757b8cf5550d bernard.paques committed Apr 13, 2010
Showing with 13 additions and 9 deletions.
  1. +7 −7 footprints.php
  2. +6 −2 sections/sections.php
View
@@ -1,6 +1,6 @@
<?php
// This file has been created by the building script scripts/build.php
-// on April 12, 2010, 9:44 pm GMT, for Bernard Paques. Please do not modify it manually.
+// on April 13, 2010, 8:31 pm GMT, for Bernard Paques. Please do not modify it manually.
global $footprints;
if(!isset($footprints)) $footprints = array();
$footprints['actions/accept.php']=array(153, '69145cd2c926d0136702b7c027084f64');
@@ -440,7 +440,7 @@
$footprints['scripts/run_once/100110_remove_obsolete.php']=array(69, 'fb9cd11489c32be43a7a7cb7126bafb2');
$footprints['scripts/run_once/100115_misc_update.php']=array(95, 'd86c56bfa7c9bf4d5baf07eacf43e3f9');
$footprints['scripts/run_once/100212_misc_update.php']=array(95, '7035abfbe1d05ed7f2b33fce6f8fc277');
-$footprints['scripts/run_once/100408_misc_update.php']=array(128, '532daed19552fdc2338f8b8cdd945d57');
+$footprints['scripts/run_once/100412_misc_update.php']=array(129, 'bf0db07460c646728a50eed80f13acf5');
$footprints['scripts/scripts.php']=array(761, '30c7ec84b85b72474c1320f801a5ba47');
$footprints['scripts/stage.php']=array(473, 'b5f40dc5355acdd5a4bf92e796262daf');
$footprints['scripts/update.php']=array(342, '598113fae3d584ddcce6d8ff2d5ab606');
@@ -488,7 +488,7 @@
$footprints['sections/own.php']=array(138, 'd0756f74eb8861203ec0345f119b1136');
$footprints['sections/print.php']=array(356, 'b7289e1b754347ab19595ee715a7f488');
$footprints['sections/section.php']=array(1419, 'b00fffa827eb1cfc6fc0e3e2840f763c');
-$footprints['sections/sections.php']=array(3109, 'b935d77d189ded22147359dcdfb98cdf');
+$footprints['sections/sections.php']=array(3113, '53c4ce8ad41c56632a44f476798399c1');
$footprints['sections/select.php']=array(212, '264eb9a0e71a25863a54572d1c1a8924');
$footprints['sections/view.php']=array(1782, '3cef17697f759a70e5107a1112f7ba0e');
$footprints['sections/view_as_freemind.php']=array(172, '8e9b5f70b3dd9310b10d28111c8d930e');
@@ -676,9 +676,9 @@
$footprints['versions/view.php']=array(188, '3a34ba105c9c6bbee968544f477aa5ec');
global $generation;
if(!isset($generation)) $generation = array();
-$generation['date']='100412-21:44:56 GMT';
-$generation['server']='localhost';
-$generation['version']='10.4.12';
+$generation['date']='100413-20:31:52 GMT';
+$generation['server']='127.0.0.1';
+$generation['version']='10.4.13';
$generation['scripts']='671'; // number of reference scripts
-$generation['lines']='196979'; // lines of code
+$generation['lines']='196984'; // lines of code
?>
@@ -1003,7 +1003,9 @@ function get_default() {
$where .= " OR sections.active='R'";
// include managed sections
- if($my_sections = Surfer::assigned_sections()) {
+ if(Surfer::is_associate())
+ $where .= " OR sections.active='N'";
+ elseif($my_sections = Surfer::assigned_sections()) {
$where .= " OR sections.id IN (".join(", ", $my_sections).")";
$where .= " OR sections.anchor IN ('section:".join("', 'section:", $my_sections)."')";
}
@@ -2010,7 +2012,9 @@ function &list_by_title_for_anchor($anchor, $offset=0, $count=20, $variant='full
$where .= " OR sections.active='R'";
// include managed sections
- if($my_sections = Surfer::assigned_sections()) {
+ if(Surfer::is_associate())
+ $where .= " OR sections.active='N'";
+ elseif($my_sections = Surfer::assigned_sections()) {
$where .= " OR sections.id IN (".join(", ", $my_sections).")";
$where .= " OR sections.anchor IN ('section:".join("', 'section:", $my_sections)."')";
}

0 comments on commit d6edab6

Please sign in to comment.