[SUCS Devel] site r679 - in branches/sucs-site: . components static

[imranh at sucs.org]

Author: imranh
Date: 2015-04-19 11:49:25 +0100 (Sun, 19 Apr 2015)
New Revision: 679

Modified:
   branches/sucs-site/
   branches/sucs-site/components/library.php
   branches/sucs-site/static/
Log:
Merge tested changes from beta into live


Property changes on: branches/sucs-site
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/beta:664-666,668-675
/branches/imranh:590-591
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674
   + /branches/beta:664-666,668-675,677-678
/branches/imranh:590-591
/branches/sucs-site/branches/sucs-site:590-591
/trunk:664-665,667-670,672,674,676-677

Modified: branches/sucs-site/components/library.php
===================================================================
--- branches/sucs-site/components/library.php	2015-04-19 10:46:51 UTC (rev 678)
+++ branches/sucs-site/components/library.php	2015-04-19 10:49:25 UTC (rev 679)
@@ -139,8 +139,9 @@
 				$tidy_config['logical-emphasis'] = true;
 				$book['description'] = tidy_repair_string($book['description'], $tidy_config);
 
+				// Commented out by ~imranh
 				// update db so we don't have to do this next time
-				$DB->Execute("UPDATE books SET description=? WHERE id=?", array($book['description'],$book['id']));
+				//$DB->Execute("UPDATE books SET description=? WHERE id=?", array($book['description'],$book['id']));
 			}
 		}
 


Property changes on: branches/sucs-site/static
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/beta/static:668-675
/trunk/static:664-665,667-670,672,674
   + /branches/beta/static:668-675,677-678
/trunk/static:664-665,667-670,672,674,676-677